From 3a095bee2ba377d8b8c137097df22a04237e3454 Mon Sep 17 00:00:00 2001 From: Carl Eugen Hoyos Date: Sun, 28 Dec 2008 19:44:47 +0000 Subject: [PATCH] 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) ^ Originally committed as revision 16374 to svn://svn.ffmpeg.org/ffmpeg/trunk --- libavcodec/qcelpdec.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/qcelpdec.c b/libavcodec/qcelpdec.c index c862928b49..c65b094f29 100644 --- a/libavcodec/qcelpdec.c +++ b/libavcodec/qcelpdec.c @@ -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;