Commit bc3f0356 authored by Maxim Poliakovski's avatar Maxim Poliakovski Committed by Kostya Shishkov

g2meet: rename FRAME_INFO to more appropriate DISPLAY_INFO

Signed-off-by: 's avatarKostya Shishkov <kostya.shishkov@gmail.com>
parent 72255478
...@@ -35,7 +35,7 @@ ...@@ -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,
...@@ -679,10 +679,10 @@ static int g2m_decode_frame(AVCodecContext *avctx, void *data, ...@@ -679,10 +679,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;
} }
...@@ -729,7 +729,7 @@ static int g2m_decode_frame(AVCodecContext *avctx, void *data, ...@@ -729,7 +729,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;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment