Browse Source

vc1dec: Check the error handling flags on slice/field header decode errors

Signed-off-by: Martin Storsjö <martin@martin.st>
tags/n2.1
Martin Storsjö 12 years ago
parent
commit
23d6ba2c44
1 changed files with 4 additions and 0 deletions
  1. +4
    -0
      libavcodec/vc1dec.c

+ 4
- 0
libavcodec/vc1dec.c View 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;
}
}


Loading…
Cancel
Save