Revert "Upconvert various types to int."

webrtc/modules/audio_coding/codecs/ilbc/my_corr.c

Index: webrtc/modules/audio_coding/codecs/ilbc/my_corr.c
diff --git a/webrtc/modules/audio_coding/codecs/ilbc/my_corr.c b/webrtc/modules/audio_coding/codecs/ilbc/my_corr.c
index 0da6d5498aafa043ac9d96a4c90026e32dbf26f8..048745a3a4357f8a63c7bb14e612376840bcfdda 100644
--- a/webrtc/modules/audio_coding/codecs/ilbc/my_corr.c
+++ b/webrtc/modules/audio_coding/codecs/ilbc/my_corr.c
@@ -29,8 +29,7 @@ void WebRtcIlbcfix_MyCorr(
     const int16_t *seq2, /* (i) second sequence */
     int16_t dim2   /* (i) dimension seq2 */
                           ){
-  int16_t max, loops;
-  int scale;
+  int16_t max, scale, loops;
 
   /* Calculate correlation between the two sequences. Scale the
      result of the multiplcication to maximum 26 bits in order
@@ -38,7 +37,7 @@ void WebRtcIlbcfix_MyCorr(
   max=WebRtcSpl_MaxAbsValueW16(seq1, dim1);
   scale=WebRtcSpl_GetSizeInBits(max);
 
-  scale = 2 * scale - 26;
+  scale = (int16_t)(2 * scale - 26);
   if (scale<0) {
     scale=0;
   }