Sponsored-by: Sovereign Tech Fund
Signed-off-by: Michael Niedermayer <mich...@niedermayer.cc>
---
libavcodec/ffv1enc.c | 15 +++++----------
1 file changed, 5 insertions(+), 10 deletions(-)
diff --git a/libavcodec/ffv1enc.c b/libavcodec/ffv1enc.c
index 6818de92494..162bf7b804f 100644
--- a/libavcodec/ffv1enc.c
+++ b/libavcodec/ffv1enc.c
@@ -1289,15 +1289,6 @@ static inline void copy_state(RemapEncoderState *dst,
const RemapEncoderState *s
dst->run1start_last_val = src->run1start_last_val;
}
-static inline void encode_mul(RemapEncoderState *s, int mul_index)
-{
- av_assert2(s->mul[ mul_index ]);
- if (s->mul[ mul_index ] < 0) {
- s->mul[ mul_index ] *= -1;
- put_symbol_inline(&s->rc, s->state[0][2], s->mul[ mul_index ], 0,
NULL, NULL);
- }
-}
-
static int encode_float32_remap_segment(FFV1SliceContext *sc,
RemapEncoderState *state_arg, int
update, int final)
{
@@ -1386,7 +1377,11 @@ static int encode_float32_remap_segment(FFV1SliceContext
*sc,
s.last_val = val;
s.current_mul_index = ((s.last_val + 1) * s.mul_count) >> 32;
if (!s.run || s.run1final) {
- encode_mul(&s, s.current_mul_index);
+ av_assert2(s.mul[ s.current_mul_index ]);
+ if (s.mul[ s.current_mul_index ] < 0) {
+ s.mul[ s.current_mul_index ] *= -1;
+ put_symbol_inline(&s.rc, s.state[0][2], s.mul[
s.current_mul_index ], 0, NULL, NULL);
+ }
s.compact_index ++;
}
}
--
2.48.1
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
To unsubscribe, visit link above, or email
ffmpeg-devel-requ...@ffmpeg.org with subject "unsubscribe".
