The branch, master has been updated
via 05b8608c76e76b7d8b4ce5e86e0940244fbb737e (commit)
from e442128944cf1034b33346180021c1f747d5bd99 (commit)
- Log -----------------------------------------------------------------
commit 05b8608c76e76b7d8b4ce5e86e0940244fbb737e
Author: Andreas Rheinhardt <[email protected]>
AuthorDate: Tue Oct 21 12:11:55 2025 +0200
Commit: Andreas Rheinhardt <[email protected]>
CommitDate: Tue Oct 21 12:11:55 2025 +0200
avcodec/x86/mpegvideoencdsp_init: Fix left shift of negative number
Uncovered by UBSan when running the mpegvideoencdsp checkasm
test.
Signed-off-by: Andreas Rheinhardt <[email protected]>
diff --git a/libavcodec/x86/mpegvideoencdsp_init.c
b/libavcodec/x86/mpegvideoencdsp_init.c
index 3cd16fefbf..bf5b722016 100644
--- a/libavcodec/x86/mpegvideoencdsp_init.c
+++ b/libavcodec/x86/mpegvideoencdsp_init.c
@@ -42,7 +42,7 @@ static int try_8x8basis_ssse3(const int16_t rem[64], const
int16_t weight[64], c
x86_reg i=0;
av_assert2(FFABS(scale) < MAX_ABS);
- scale <<= 16 + SCALE_OFFSET - BASIS_SHIFT + RECON_SHIFT;
+ scale *= 1 << (16 + SCALE_OFFSET - BASIS_SHIFT + RECON_SHIFT);
__asm__ volatile(
"pxor %%xmm2, %%xmm2 \n\t"
@@ -87,7 +87,7 @@ static void add_8x8basis_ssse3(int16_t rem[64], const int16_t
basis[64], int sca
x86_reg i=0;
if (FFABS(scale) < 1024) {
- scale <<= 16 + SCALE_OFFSET - BASIS_SHIFT + RECON_SHIFT;
+ scale *= 1 << (16 + SCALE_OFFSET - BASIS_SHIFT + RECON_SHIFT);
__asm__ volatile(
"movd %3, %%xmm2 \n\t"
"punpcklwd %%xmm2, %%xmm2 \n\t"
-----------------------------------------------------------------------
Summary of changes:
libavcodec/x86/mpegvideoencdsp_init.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
hooks/post-receive
--
_______________________________________________
ffmpeg-cvslog mailing list -- [email protected]
To unsubscribe send an email to [email protected]
