vc1dec: Check the error handling flags on slice/field header decode errors
authorMartin Storsjö <martin@martin.st>
Sun, 22 Sep 2013 11:50:48 +0000 (14:50 +0300)
committerMartin Storsjö <martin@martin.st>
Sun, 22 Sep 2013 18:02:52 +0000 (21:02 +0300)
Signed-off-by: Martin Storsjö <martin@martin.st>
libavcodec/vc1dec.c

index 602b155..803c8be 100644 (file)
@@ -6013,12 +6013,16 @@ static int vc1_decode_frame(AVCodecContext *avctx, void *data,
                 if (v->field_mode && i == n_slices1 + 2) {
                     if ((header_ret = ff_vc1_parse_frame_header_adv(v, &s->gb)) < 0) {
                         av_log(v->s.avctx, AV_LOG_ERROR, "Field header damaged\n");
+                        if (avctx->err_recognition & AV_EF_EXPLODE)
+                            goto err;
                         continue;
                     }
                 } else if (get_bits1(&s->gb)) {
                     v->pic_header_flag = 1;
                     if ((header_ret = ff_vc1_parse_frame_header_adv(v, &s->gb)) < 0) {
                         av_log(v->s.avctx, AV_LOG_ERROR, "Slice header damaged\n");
+                        if (avctx->err_recognition & AV_EF_EXPLODE)
+                            goto err;
                         continue;
                     }
                 }