[FFmpeg-devel] [PATCH 09/11] avcodec/ffv1enc: Simplify last_val update

[Michael Niedermayer]

Sponsored-by: Sovereign Tech Fund
Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>
---
 libavcodec/ffv1enc.c | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/libavcodec/ffv1enc.c b/libavcodec/ffv1enc.c
index 962ea4abe48..1d7ab1725ac 100644
--- a/libavcodec/ffv1enc.c
+++ b/libavcodec/ffv1enc.c
@@ -1349,8 +1349,8 @@ static int encode_float32_remap_segment(FFV1SliceContext *sc, Unit unit[4][65536
                 if (step == 1) {
                     s.delta_stack[s.run] = delta;
                     s.run ++;
-                    av_assert2(s.i == s.pixel_num || s.last_val + current_mul + delta == unit[s.p][s.i].val);
-                    s.last_val += current_mul + delta;
+                    av_assert2(s.last_val + current_mul + delta == val);
+                    s.last_val = val;
                 } else {
                     put_symbol_inline(&s.rc, s.state[s.lu][0], s.run, 0, NULL, NULL);
 
@@ -1376,9 +1376,8 @@ static int encode_float32_remap_segment(FFV1SliceContext *sc, Unit unit[4][65536
                 if (step == 1)
                     s.lu ^= 1;
 
-                av_assert2(s.i == s.pixel_num || s.last_val + step * current_mul + delta == unit[s.p][s.i].val);
-                if (s.i < s.pixel_num)
-                    s.last_val = unit[s.p][s.i].val;
+                av_assert2(s.last_val + step * current_mul + delta == val);
+                s.last_val = val;
             }
             s.current_mul_index = ((s.last_val + 1) * s.mul_count) >> 32;
             if (!s.run)
-- 
2.48.1