Merge commit '6536da7371b4847a2824ed46b98829f127f24dad'

[ffmpeg] / libavcodec / gsmdec_template.c

diff --git a/libavcodec/gsmdec_template.c b/libavcodec/gsmdec_template.c
index 0c60813a4ab9e148890cb6d0ed1ac9c3f68ac2de..4cb777c854c3e59a444dfc75375c25b77c9455fd 100644 (file)
--- a/libavcodec/gsmdec_template.c
+++ b/libavcodec/gsmdec_template.c
@@ -64,7 +64,7 @@ static inline int decode_log_area(int coded, int factor, int offset)
 {
     coded <<= 10;
     coded -= offset;
-    return gsm_mult(coded, factor) << 1;
+    return gsm_mult(coded, factor) * 2;
 }
 
 static av_noinline int get_rrp(int filtered)
@@ -121,7 +121,7 @@ static int postprocess(int16_t *data, int msr)
     int i;
     for (i = 0; i < 160; i++) {
         msr = av_clip_int16(data[i] + gsm_mult(msr, 28180));
-        data[i] = av_clip_int16(msr << 1) & ~7;
+        data[i] = av_clip_int16(msr * 2) & ~7;
     }
     return msr;
 }