[FFmpeg-cvslog] avcodec/pixlet: Simplify pfx computation
Michael Niedermayer
git at videolan.org
Sat Jul 13 00:05:03 EEST 2024
ffmpeg | branch: master | Michael Niedermayer <michael at niedermayer.cc> | Fri Jul 5 02:21:56 2024 +0200| [0474614e6cf8edcd0077b95772c29fae894a7db9] | committer: Michael Niedermayer
avcodec/pixlet: Simplify pfx computation
Found by reviewing code related to CID1604365 Overflowed constant
Sponsored-by: Sovereign Tech Fund
Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=0474614e6cf8edcd0077b95772c29fae894a7db9
---
libavcodec/pixlet.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/libavcodec/pixlet.c b/libavcodec/pixlet.c
index 6b6e39f275..e9c561d70d 100644
--- a/libavcodec/pixlet.c
+++ b/libavcodec/pixlet.c
@@ -231,8 +231,8 @@ static int read_high_coeffs(AVCodecContext *avctx, const uint8_t *src, int16_t *
if (cnt1 >= length) {
cnt1 = get_bits(bc, nbits);
} else {
- pfx = 14 + ((((uint64_t)(value - 14)) >> 32) & (value - 14));
- if (pfx < 1 || pfx > 25)
+ pfx = FFMIN(value, 14);
+ if (pfx < 1)
return AVERROR_INVALIDDATA;
cnt1 *= (1 << pfx) - 1;
shbits = show_bits(bc, pfx);
More information about the ffmpeg-cvslog
mailing list