Revert "Upconvert various types to int."

webrtc/modules/audio_coding/codecs/isac/fix/source/arith_routins.h

 /*
  *  Copyright (c) 2011 The WebRTC project authors. All Rights Reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
@@ skipping 56 matching lines @@
  *      - envQ8             : side info vector defining the width of the pdf
  *                            in Q8
  *      - lenData           : data vector length
  *
  * Input/Output:
  *      - dataQ7            : input: dither vector, output: data vector, in Q7
  *
  * Return value             : number of bytes in the stream so far
  *                            <0 if error detected
  */
-int WebRtcIsacfix_DecLogisticMulti2(
+int16_t WebRtcIsacfix_DecLogisticMulti2(
     int16_t *data,
     Bitstr_dec *streamData,
     const int32_t *env,
     const int16_t lenData);
 
 
 /****************************************************************************
  * WebRtcIsacfix_EncHistMulti(...)
  *
  * Encode the histogram interval
@@ skipping 63 matching lines @@
  *                            <0 if error detected
  */
 int16_t WebRtcIsacfix_DecHistOneStepMulti(
     int16_t *data,
     Bitstr_dec *streamData,
     const uint16_t **cdf,
     const uint16_t *initIndex,
     const int16_t lenData);
 
 #endif /* WEBRTC_MODULES_AUDIO_CODING_CODECS_ISAC_FIX_SOURCE_ARITH_ROUTINS_H_ */