virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

g2meet: Rename FRAME_INFO to more appropriate DISPLAY_INFO

Browse Source 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Maxim Poliakovski 2013-10-22 00:17:22 +02:00 committed by Michael Niedermayer
parent 0c67864a37
commit cb2162adba
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libavcodec/g2meet.c
View File

@ -35,7 +35,7 @@
#include "mjpeg.h" #include "mjpeg.h"
enum ChunkType { enum ChunkType {
FRAME_INFO = 0xC8, DISPLAY_INFO = 0xC8,
TILE_DATA, TILE_DATA,
CURSOR_POS, CURSOR_POS,
CURSOR_SHAPE, CURSOR_SHAPE,
@ -680,10 +680,10 @@ static int g2m_decode_frame(AVCodecContext *avctx, void *data,
break; break;
} }
switch (chunk_type) { switch (chunk_type) {
case FRAME_INFO: case DISPLAY_INFO:
c->got_header = 0; c->got_header = 0;
if (chunk_size < 21) { 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); chunk_size);
break; break;
} }
@ -733,7 +733,7 @@ static int g2m_decode_frame(AVCodecContext *avctx, void *data,
case TILE_DATA: case TILE_DATA:
if (!c->tiles_x || !c->tiles_y) { if (!c->tiles_x || !c->tiles_y) {
av_log(avctx, AV_LOG_WARNING, 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)); bytestream2_skip(&bc, bytestream2_get_bytes_left(&bc));
break; break;
} }