Merge commit 'be1db21ba88fe86036fea9f8d2c1a5f47c2a0a7e'

[ffmpeg] / libavcodec / mpegaudiodec_template.c

diff --git a/libavcodec/mpegaudiodec_template.c b/libavcodec/mpegaudiodec_template.c
index a3729a9e297e2d845208d9d8f48dd2619351830e..a5ac5817f34b5f8eab4df2345119171e38f6a5ec 100644 (file)
--- a/libavcodec/mpegaudiodec_template.c
+++ b/libavcodec/mpegaudiodec_template.c
@@ -251,9 +251,9 @@ static inline int l3_unscale(int value, int exponent)
     if(e < 1)
         av_log(NULL, AV_LOG_WARNING, "l3_unscale: e is %d\n", e);
 #endif
-    if (e > 31)
+    if (e > (SUINT)31)
         return 0;
-    m = (m + (1 << (e - 1))) >> e;
+    m = (m + ((1U << e)>>1)) >> e;
 
     return m;
 }