[FFmpeg-cvslog] g2meet: Rename FRAME_INFO to more appropriate DISPLAY_INFO

[Maxim Poliakovski]

ffmpeg | branch: master | Maxim Poliakovski <maximumspatium at googlemail.com> | Tue Oct 22 00:17:22 2013 +0200| [cb2162adba4041951c987f9f365957e067b28a97] | committer: Michael Niedermayer

g2meet: Rename FRAME_INFO to more appropriate DISPLAY_INFO

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=cb2162adba4041951c987f9f365957e067b28a97
---

 libavcodec/g2meet.c |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/libavcodec/g2meet.c b/libavcodec/g2meet.c
index 9b70b61..b982eab 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,
@@ -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;
             }