diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-09-23 14:34:18 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-09-23 14:34:36 +0200 |
| commit | 50138a9235b06b71a65e6ba9abba0ad0c9c64af0 (patch) | |
| tree | c32ba24cd1587233bc3ac525474eb27f80c51b6c /libavcodec/vc1dec.c | |
| parent | eeeb3c8fa3a17c6d3363e68d8219cb8c07397f3b (diff) | |
| parent | 23d6ba2c44540eb39c6880e4cbd527d297d264a9 (diff) | |
| download | ffmpeg-50138a9235b06b71a65e6ba9abba0ad0c9c64af0.tar.gz | |
Merge commit '23d6ba2c44540eb39c6880e4cbd527d297d264a9'
* commit '23d6ba2c44540eb39c6880e4cbd527d297d264a9':
vc1dec: Check the error handling flags on slice/field header decode errors
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/vc1dec.c')
| -rw-r--r-- | libavcodec/vc1dec.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/libavcodec/vc1dec.c b/libavcodec/vc1dec.c index 74b498030c..e992640f05 100644 --- a/libavcodec/vc1dec.c +++ b/libavcodec/vc1dec.c @@ -6108,12 +6108,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; } } |