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

avcodec/mpeg4videodec: Ignore multiple VOL headers

Browse Source 
Fixes: Ticket7005

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit 63a4bdbf3b732504e54cc2b9ec0886e6242a90bc)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
This commit is contained in:
Michael Niedermayer 2018-02-09 22:24:58 +01:00
parent c6b5e80635
commit ce46e45f4c
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libavcodec/mpeg4videodec.c
View File

@ -2653,8 +2653,8 @@ int ff_mpeg4_decode_picture_header(Mpeg4DecContext *ctx, GetBitContext *gb)
if (startcode >= 0x120 && startcode <= 0x12F) { if (startcode >= 0x120 && startcode <= 0x12F) {
if (vol) { if (vol) {
av_log(s->avctx, AV_LOG_ERROR, "Multiple VOL headers"); av_log(s->avctx, AV_LOG_WARNING, "Ignoring multiple VOL headers\n");
return AVERROR_INVALIDDATA; continue;
} }
vol++; vol++;
if ((ret = decode_vol_header(ctx, gb)) < 0) if ((ret = decode_vol_header(ctx, gb)) < 0)