highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

avcodec/qdrw: another try at skipping the first 512 bytes

Browse Source 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer
2015-05-14 12:14:52 +02:00
parent 5c219e289e
commit 5c8e4bf7c4
1 changed files with 27 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
libavcodec/qdrw.c
View File

@@ -114,6 +114,29 @@ static int decode_rle(AVCodecContext *avctx, AVFrame *p, GetByteContext *gbc,
return 0; return 0;
} }
static int check_header(const char *buf, int buf_size)
{
unsigned w, h, v0, v1;
if (buf_size < 40)
return 0;
w = AV_RB16(buf+6);
h = AV_RB16(buf+8);
v0 = AV_RB16(buf+10);
v1 = AV_RB16(buf+12);
if (!w || !h)
return 0;
if (v0 == 0x1101)
return 1;
if (v0 == 0x0011 && v1 == 0x02FF)
return 2;
return 0;
}
static int decode_frame(AVCodecContext *avctx, static int decode_frame(AVCodecContext *avctx,
void *data, int *got_frame, void *data, int *got_frame,
AVPacket *avpkt) AVPacket *avpkt)
@@ -124,9 +147,10 @@ static int decode_frame(AVCodecContext *avctx,
int w, h, ret; int w, h, ret;
bytestream2_init(&gbc, avpkt->data, avpkt->size); bytestream2_init(&gbc, avpkt->data, avpkt->size);
while ( bytestream2_get_bytes_left(&gbc) >= 552 if ( bytestream2_get_bytes_left(&gbc) >= 552
&& ( !AV_RB16(&avpkt->data[bytestream2_tell(&gbc)+6]) && !check_header(gbc.buffer , bytestream2_get_bytes_left(&gbc))
|| !AV_RB16(&avpkt->data[bytestream2_tell(&gbc)+8]))) && check_header(gbc.buffer + 512, bytestream2_get_bytes_left(&gbc) - 512)
)
bytestream2_skip(&gbc, 512); bytestream2_skip(&gbc, 512);
/* smallest PICT header */ /* smallest PICT header */