summaryrefslogtreecommitdiff
path: root/libavcodec/g2meet.c
diff options
context:
space:
mode:
authorMaxim Poliakovski <max_pole@gmx.de>2013-10-22 00:17:22 +0200
committerKostya Shishkov <kostya.shishkov@gmail.com>2014-02-09 16:13:23 +0100
commitbc3f03567a04a9f7e412bcf2ca09c163f3f13941 (patch)
tree107a01f460850a8002f61bf8c21ff34894602344 /libavcodec/g2meet.c
parent722554788b77c13748e83458f626a9ac38b70072 (diff)
g2meet: rename FRAME_INFO to more appropriate DISPLAY_INFO
Signed-off-by: Kostya Shishkov <kostya.shishkov@gmail.com>
Diffstat (limited to 'libavcodec/g2meet.c')
-rw-r--r--libavcodec/g2meet.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/libavcodec/g2meet.c b/libavcodec/g2meet.c
index 0b36dbd0d5..9ce56c9cc3 100644
--- a/libavcodec/g2meet.c
+++ b/libavcodec/g2meet.c
@@ -35,7 +35,7 @@
#include "mjpeg.h"
enum ChunkType {
- FRAME_INFO = 0xC8,
+ DISPLAY_INFO = 0xC8,
TILE_DATA,
CURSOR_POS,
CURSOR_SHAPE,
@@ -679,10 +679,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;
}
@@ -729,7 +729,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;
}