Commit f03616d2 authored by Michael Niedermayer's avatar Michael Niedermayer

avcodec/mpeg4videodec: Ignore multiple VOL headers

Fixes: Ticket7005
Signed-off-by: 's avatarMichael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit 63a4bdbf)
Signed-off-by: 's avatarMichael Niedermayer <michael@niedermayer.cc>
parent 0df3ad79
...@@ -2670,8 +2670,8 @@ int ff_mpeg4_decode_picture_header(Mpeg4DecContext *ctx, GetBitContext *gb) ...@@ -2670,8 +2670,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)
......
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