| Message ID | 20210731174844.16646-2-michael@niedermayer.cc |
|---|---|
| State | Accepted |
| Commit | 643b2d49bf52d5a3205ce3db732e0c4c396bd457 |
| Headers | show |
| Series | [FFmpeg-devel,1/3] avcodec/sbrdsp_fixed: Fix negation overflow in sbr_neg_odd_64_c() | expand |
| Context | Check | Description |
|---|---|---|
| andriy/x86_make | success | Make finished |
| andriy/x86_make_fate | success | Make fate finished |
| andriy/PPC64_make | success | Make finished |
| andriy/PPC64_make_fate | success | Make fate finished |
diff --git a/libavcodec/vc1dec.c b/libavcodec/vc1dec.c index 6cd74a09f1..1fb1950ade 100644 --- a/libavcodec/vc1dec.c +++ b/libavcodec/vc1dec.c @@ -1121,7 +1121,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); }
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> --- libavcodec/vc1dec.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)