diff options
| author | Carl Eugen Hoyos <cehoyos@rainbow.studorg.tuwien.ac.at> | 2008-12-28 19:44:47 +0000 |
|---|---|---|
| committer | Carl Eugen Hoyos <cehoyos@rainbow.studorg.tuwien.ac.at> | 2008-12-28 19:44:47 +0000 |
| commit | 3a095bee2ba377d8b8c137097df22a04237e3454 (patch) | |
| tree | 36a1057f776d1819d6bba0a3d5ac8a3acd04af9b /libavcodec/qcelpdec.c | |
| parent | 2c67c659639f3350e9e28d21bdcfc2dc76d4375b (diff) | |
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
Diffstat (limited to 'libavcodec/qcelpdec.c')
| -rw-r--r-- | libavcodec/qcelpdec.c | 2 |
1 files changed, 1 insertions, 1 deletions
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; |