diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2017-03-16 11:20:46 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2017-05-20 03:41:33 +0200 |
| commit | a2a028af6e6f42b837afd7ab02e43ec1375be746 (patch) | |
| tree | fb2a06744d7c0b09be47808fcb2800b66fc68bd2 | |
| parent | 26b2b2d052af89fd364d94827008186ac1f1f94c (diff) | |
| download | ffmpeg-a2a028af6e6f42b837afd7ab02e43ec1375be746.tar.gz | |
avcodec/vp56: Check avctx->error_concealment before enabling EC
Fixes timeout with 847/clusterfuzz-testcase-5291877358108672
Fixes timeout with 850/clusterfuzz-testcase-5721296509861888
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit 98da63b3f5f5a277c5c3a16860db9a9f6741e54c)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
| -rw-r--r-- | libavcodec/vp56.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/vp56.c b/libavcodec/vp56.c index 9d4162bb96..bfc3d3bc7c 100644 --- a/libavcodec/vp56.c +++ b/libavcodec/vp56.c @@ -712,7 +712,7 @@ static int ff_vp56_decode_mbs(AVCodecContext *avctx, void *data, int ret = vp56_decode_mb(s, mb_row, mb_col, is_alpha); if (ret < 0) { damaged = 1; - if (!s->have_undamaged_frame) { + if (!s->have_undamaged_frame || !avctx->error_concealment) { s->discard_frame = 1; return AVERROR_INVALIDDATA; } |