g2meet: rename FRAME_INFO to more appropriate DISPLAY_INFO
authorMaxim Poliakovski <max_pole@gmx.de>
Mon, 21 Oct 2013 22:17:22 +0000 (00:17 +0200)
committerKostya Shishkov <kostya.shishkov@gmail.com>
Sun, 9 Feb 2014 15:13:23 +0000 (16:13 +0100)
Signed-off-by: Kostya Shishkov <kostya.shishkov@gmail.com>
libavcodec/g2meet.c

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