avcodec/mpeg12dec: forward errors when EXPLODE is set
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 30 Oct 2013 01:06:32 +0000 (02:06 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 30 Oct 2013 01:08:34 +0000 (02:08 +0100)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/mpeg12dec.c

index 82b503d..6b6c03e 100644 (file)
@@ -2185,6 +2185,10 @@ static int decode_chunks(AVCodecContext *avctx,
                 }
             }
             s2->pict_type = 0;
+
+            if (avctx->err_recognition & AV_EF_EXPLODE && s2->er.error_count)
+                return AVERROR_INVALIDDATA;
+
             return FFMAX(0, buf_ptr - buf - s2->parse_context.last_index);
         }