eessppeelllloo/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-12-12 01:40:04 +01:00
Code Issues Packages Projects Releases Wiki Activity

avcodec/webp: Check for VP8X after other VP8 chunks

Browse Source 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
This commit is contained in:
Michael Niedermayer
2017-05-08 14:43:01 +02:00
parent cfbebe9dda
commit 2f2bc2e246
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
libavcodec/webp.c
View File

@@ -1423,6 +1423,10 @@ static int webp_decode_frame(AVCodecContext *avctx, void *data, int *got_frame,
bytestream2_skip(&gb, chunk_size); bytestream2_skip(&gb, chunk_size);
break; break;
case MKTAG('V', 'P', '8', 'X'): case MKTAG('V', 'P', '8', 'X'):
if (s->width || s->height || *got_frame) {
av_log(avctx, AV_LOG_ERROR, "Canvas dimensions are already set\n");
return AVERROR_INVALIDDATA;
}
vp8x_flags = bytestream2_get_byte(&gb); vp8x_flags = bytestream2_get_byte(&gb);
bytestream2_skip(&gb, 3); bytestream2_skip(&gb, 3);
s->width = bytestream2_get_le24(&gb) + 1; s->width = bytestream2_get_le24(&gb) + 1;