Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
F
ffmpeg.wasm-core
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Linshizhi
ffmpeg.wasm-core
Commits
cb2162ad
Commit
cb2162ad
authored
Oct 21, 2013
by
Maxim Poliakovski
Committed by
Michael Niedermayer
Feb 08, 2014
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
g2meet: Rename FRAME_INFO to more appropriate DISPLAY_INFO
Signed-off-by:
Michael Niedermayer
<
michaelni@gmx.at
>
parent
0c67864a
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
4 deletions
+4
-4
g2meet.c
libavcodec/g2meet.c
+4
-4
No files found.
libavcodec/g2meet.c
View file @
cb2162ad
...
...
@@ -35,7 +35,7 @@
#include "mjpeg.h"
enum
ChunkType
{
FRAME
_INFO
=
0xC8
,
DISPLAY
_INFO
=
0xC8
,
TILE_DATA
,
CURSOR_POS
,
CURSOR_SHAPE
,
...
...
@@ -680,10 +680,10 @@ static int g2m_decode_frame(AVCodecContext *avctx, void *data,
break
;
}
switch
(
chunk_type
)
{
case
FRAME
_INFO
:
case
DISPLAY
_INFO
:
c
->
got_header
=
0
;
if
(
chunk_size
<
21
)
{
av_log
(
avctx
,
AV_LOG_ERROR
,
"Invalid
frame
info size %d
\n
"
,
av_log
(
avctx
,
AV_LOG_ERROR
,
"Invalid
display
info size %d
\n
"
,
chunk_size
);
break
;
}
...
...
@@ -733,7 +733,7 @@ static int g2m_decode_frame(AVCodecContext *avctx, void *data,
case
TILE_DATA
:
if
(
!
c
->
tiles_x
||
!
c
->
tiles_y
)
{
av_log
(
avctx
,
AV_LOG_WARNING
,
"No
frame header
- skipping tile
\n
"
);
"No
display info
- skipping tile
\n
"
);
bytestream2_skip
(
&
bc
,
bytestream2_get_bytes_left
(
&
bc
));
break
;
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment