From 9f2ace74ef492b6ba7b4c0cc07f1e29d164f5889 Mon Sep 17 00:00:00 2001 From: Carl Eugen Hoyos Date: Mon, 22 Dec 2008 22:12:44 +0000 Subject: Fix two identical warnings when compiling riff.c and nuv.c with icc: warning #188: enumerated type mixed with another type Originally committed as revision 16281 to svn://svn.ffmpeg.org/ffmpeg/trunk --- libavformat/riff.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'libavformat/riff.c') diff --git a/libavformat/riff.c b/libavformat/riff.c index 7c40c6f2ca..047af0ab61 100644 --- a/libavformat/riff.c +++ b/libavformat/riff.c @@ -425,9 +425,9 @@ void get_wav_header(ByteIOContext *pb, AVCodecContext *codec, int size) } -int wav_codec_get_id(unsigned int tag, int bps) +enum CodecID wav_codec_get_id(unsigned int tag, int bps) { - int id; + enum CodecID id; id = codec_get_id(codec_wav_tags, tag); if (id <= 0) return id; -- cgit v1.2.3