[FFmpeg-cvslog] r16374 - trunk/libavcodec/qcelpdec.c

cehoyos subversion
Sun Dec 28 20:44:48 CET 2008


Author: cehoyos
Date: Sun Dec 28 20:44:47 2008
New Revision: 16374

Log:
Silence one warning when compiling with icc:
warning #188: enumerated type mixed with another type
      if((q->bitrate = determine_bitrate(avctx, buf_size, &buf)) == I_F_Q)
                     ^

Modified:
   trunk/libavcodec/qcelpdec.c

Modified: trunk/libavcodec/qcelpdec.c
==============================================================================
--- trunk/libavcodec/qcelpdec.c	Sun Dec 28 20:40:13 2008	(r16373)
+++ trunk/libavcodec/qcelpdec.c	Sun Dec 28 20:44:47 2008	(r16374)
@@ -646,7 +646,7 @@ static qcelp_packet_rate buf_size2bitrat
  *
  * 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;




More information about the ffmpeg-cvslog mailing list