From efe4aef90fd8d4259aed0a6ffe317b5be6557da9 Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Fri, 8 Mar 2019 13:05:13 +0100 Subject: [PATCH] avcodec/ffv1dec_template: Optimize golomb run mode Fixes: Timeout (34sec -> 12sec) Fixes: 13398/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_FFV1_fuzzer-5664106709778432 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavcodec/ffv1dec_template.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/libavcodec/ffv1dec_template.c b/libavcodec/ffv1dec_template.c index 25032feda0b..1b7f6c4bf56 100644 --- a/libavcodec/ffv1dec_template.c +++ b/libavcodec/ffv1dec_template.c @@ -86,6 +86,11 @@ static av_always_inline int RENAME(decode_line)(FFV1Context *s, int w, run_mode = 2; } } + while (run_count > 1 && w-x > 1) { + sample[1][x] = RENAME(predict)(sample[1] + x, sample[0] + x); + x++; + run_count--; + } run_count--; if (run_count < 0) { run_mode = 0; -- 2.39.2