summaryrefslogtreecommitdiff
path: root/libavcodec/mpeg4videodec.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michael@niedermayer.cc>2018-02-09 22:24:58 +0100
committerMichael Niedermayer <michael@niedermayer.cc>2018-02-11 12:06:04 +0100
commit63a4bdbf3b732504e54cc2b9ec0886e6242a90bc (patch)
treef986290909589fe24900150f0d4419a808afa289 /libavcodec/mpeg4videodec.c
parentf4d5d7e8de189ab448a5e662245b57ceb8f20df6 (diff)
avcodec/mpeg4videodec: Ignore multiple VOL headers
Fixes: Ticket7005 Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Diffstat (limited to 'libavcodec/mpeg4videodec.c')
-rw-r--r--libavcodec/mpeg4videodec.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/mpeg4videodec.c b/libavcodec/mpeg4videodec.c
index 756753e2fc..19210d97fe 100644
--- a/libavcodec/mpeg4videodec.c
+++ b/libavcodec/mpeg4videodec.c
@@ -2707,8 +2707,8 @@ int ff_mpeg4_decode_picture_header(Mpeg4DecContext *ctx, GetBitContext *gb)
if (startcode >= 0x120 && startcode <= 0x12F) {
if (vol) {
- av_log(s->avctx, AV_LOG_ERROR, "Multiple VOL headers");
- return AVERROR_INVALIDDATA;
+ av_log(s->avctx, AV_LOG_WARNING, "Ignoring multiple VOL headers\n");
+ continue;
}
vol++;
if ((ret = decode_vol_header(ctx, gb)) < 0)