Silence one warning when compiling with icc:
authorCarl Eugen Hoyos <cehoyos@rainbow.studorg.tuwien.ac.at>
Sun, 28 Dec 2008 19:44:47 +0000 (19:44 +0000)
committerCarl Eugen Hoyos <cehoyos@rainbow.studorg.tuwien.ac.at>
Sun, 28 Dec 2008 19:44:47 +0000 (19:44 +0000)
warning #188: enumerated type mixed with another type
      if((q->bitrate = determine_bitrate(avctx, buf_size, &buf)) == I_F_Q)
                     ^

Originally committed as revision 16374 to svn://svn.ffmpeg.org/ffmpeg/trunk

libavcodec/qcelpdec.c

index c862928b49330659e3a57e362010403f2af9502d..c65b094f29c689721099168b0912437f708cc95c 100644 (file)
@@ -646,7 +646,7 @@ static qcelp_packet_rate buf_size2bitrate(const int buf_size)
  *
  * TIA/EIA/IS-733 2.4.8.7.1
  */
-static int determine_bitrate(AVCodecContext *avctx, const int buf_size,
+static qcelp_packet_rate determine_bitrate(AVCodecContext *avctx, const int buf_size,
                              const uint8_t **buf)
 {
     qcelp_packet_rate bitrate;