aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndreas Rheinhardt <andreas.rheinhardt@gmail.com>2019-09-18 05:26:07 +0200
committerMichael Niedermayer <michael@niedermayer.cc>2019-09-18 22:53:00 +0200
commitebd25a5ba532633326d3944eda2e982380ef6626 (patch)
tree9f4685fdc2748669776925e4355e2c6995e2c61a
parente12a2a2d73436e1514293367ec662562df1780e3 (diff)
downloadffmpeg-ebd25a5ba532633326d3944eda2e982380ef6626.tar.gz
avutil/common: Fix undefined shift
av_mod_uintp2_c uses a bitwise AND with (1 << p) - 1 to clear the high bits of an unsigned int. But this is undefined if p == 31, because 1 is an int and 2^31 is not representable in an int. So make 1 unsigned. Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
-rw-r--r--libavutil/common.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavutil/common.h b/libavutil/common.h
index 8db0291170..af35397eb9 100644
--- a/libavutil/common.h
+++ b/libavutil/common.h
@@ -240,7 +240,7 @@ static av_always_inline av_const unsigned av_clip_uintp2_c(int a, int p)
*/
static av_always_inline av_const unsigned av_mod_uintp2_c(unsigned a, unsigned p)
{
- return a & ((1 << p) - 1);
+ return a & ((1U << p) - 1);
}
/**