Revert "Upconvert various types to int."

webrtc/modules/audio_coding/neteq/test/RTPencode.cc

Index: webrtc/modules/audio_coding/neteq/test/RTPencode.cc
diff --git a/webrtc/modules/audio_coding/neteq/test/RTPencode.cc b/webrtc/modules/audio_coding/neteq/test/RTPencode.cc
index 1ef9ce535ad70717b0c59626893ea01b528dd169..c097f5f28d3a391d53b50ef6dc9f3832f32746e6 100644
--- a/webrtc/modules/audio_coding/neteq/test/RTPencode.cc
+++ b/webrtc/modules/audio_coding/neteq/test/RTPencode.cc
@@ -1561,7 +1561,7 @@ int NetEQTest_encode(int coder,
                      int useVAD,
                      int bitrate,
                      int numChannels) {
-  int cdlen = 0;
+  short cdlen = 0;
   int16_t* tempdata;
   static int first_cng = 1;
   int16_t tempLen;