From e9cfed35a582433d1a397ae8efa82d4d295d40e7 Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Mon, 24 Mar 2025 16:19:49 +0100 Subject: [PATCH] avcodec/ffv1enc: eliminate if() Signed-off-by: Michael Niedermayer --- libavcodec/ffv1enc.c | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/libavcodec/ffv1enc.c b/libavcodec/ffv1enc.c index 80cf27bc11..5ea871f7db 100644 --- a/libavcodec/ffv1enc.c +++ b/libavcodec/ffv1enc.c @@ -1327,19 +1327,17 @@ static int encode_float32_remap_segment(FFV1SliceContext *sc, val = sc->unit[s.p][s.i].val; if (s.last_val != val) { - int64_t delta = 0; + int64_t delta = val - s.last_val; av_assert2(s.last_val < val); av_assert2(current_mul > 0); - if (current_mul > 1) { - delta = val - s.last_val; - val = FFMAX(1, (delta + current_mul/2) / current_mul); + val = FFMAX(1, (delta + current_mul/2) / current_mul); + + delta -= val*current_mul; + av_assert2(delta <= current_mul/2); + av_assert2(delta > -current_mul); + val += s.last_val; - delta -= val*current_mul; - av_assert2(delta <= current_mul/2); - av_assert2(delta > -current_mul); - val += s.last_val; - } av_assert2(s.last_val < val); if (s.lu) { s.index_stack[s.run] = s.current_mul_index;