aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michael@niedermayer.cc>2017-05-28 20:08:49 +0200
committerMichael Niedermayer <michael@niedermayer.cc>2017-05-28 21:20:28 +0200
commit872bac81590ccbec40ba7ad203421d9e38d1b253 (patch)
tree3cfd05fbba914e180d802802cf9ee2f0ac27e473
parent67020711b7d45afa073ef671f755765035a64373 (diff)
downloadffmpeg-872bac81590ccbec40ba7ad203421d9e38d1b253.tar.gz
avcodec/aac_defines: Add missing () to AAC_HALF_SUM() macro
Fixes: runtime error: shift exponent 1073741848 is too large for 32-bit type 'INTFLOAT' (aka 'int') Fixes: 1880/clusterfuzz-testcase-minimized-4900645322620928 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
-rw-r--r--libavcodec/aac_defines.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/aac_defines.h b/libavcodec/aac_defines.h
index 0ea667e77b..3c79a8a4a1 100644
--- a/libavcodec/aac_defines.h
+++ b/libavcodec/aac_defines.h
@@ -72,7 +72,7 @@ typedef int AAC_SIGNE;
#define AAC_MSUB31_V3(x, y, z) (int)((((int64_t)(x) * (z)) - \
((int64_t)(y) * (z)) + \
0x40000000) >> 31)
-#define AAC_HALF_SUM(x, y) (x) >> 1 + (y) >> 1
+#define AAC_HALF_SUM(x, y) (((x) >> 1) + ((y) >> 1))
#define AAC_SRA_R(x, y) (int)(((x) + (1 << ((y) - 1))) >> (y))
#else