diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2021-07-31 00:01:53 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2021-09-12 11:22:04 +0200 |
| commit | 2b4e4af6dcf4da83cd6c78404c535c7dd9a77b0d (patch) | |
| tree | be3faed0eac617b2b0ea9e6365ef412abf150d17 | |
| parent | 0b98a1d5e55322b80e652c53e4882f9c964ff1ae (diff) | |
| download | ffmpeg-2b4e4af6dcf4da83cd6c78404c535c7dd9a77b0d.tar.gz | |
avcodec/vc1dec: Disable error concealment for *IMAGE
The existing error concealment makes no sense for the image formats, they
use transformed source images which is different from keyframe + MC+difference
for which the error concealment is designed.
Of course feel free to re-enable this if you have a case where it works and
improves vissual results
Fixes: Timeout
Fixes: 36234/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_VC1IMAGE_fuzzer-6300306743885824
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit 643b2d49bf52d5a3205ce3db732e0c4c396bd457)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
| -rw-r--r-- | libavcodec/vc1dec.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/libavcodec/vc1dec.c b/libavcodec/vc1dec.c index d05c902b70..80a7863716 100644 --- a/libavcodec/vc1dec.c +++ b/libavcodec/vc1dec.c @@ -1114,7 +1114,9 @@ static int vc1_decode_frame(AVCodecContext *avctx, void *data, ret = AVERROR_INVALIDDATA; goto err; } - if (!v->field_mode) + if ( !v->field_mode + && avctx->codec_id != AV_CODEC_ID_WMV3IMAGE + && avctx->codec_id != AV_CODEC_ID_VC1IMAGE) ff_er_frame_end(&s->er); } |