aboutsummaryrefslogtreecommitdiffstats
path: root/libavformat/riff.c
diff options
context:
space:
mode:
authorCarl Eugen Hoyos <cehoyos@rainbow.studorg.tuwien.ac.at>2008-12-22 22:12:44 +0000
committerCarl Eugen Hoyos <cehoyos@rainbow.studorg.tuwien.ac.at>2008-12-22 22:12:44 +0000
commit9f2ace74ef492b6ba7b4c0cc07f1e29d164f5889 (patch)
treec07f92df9e5ddea8c486e3744ebdcda6ff59b268 /libavformat/riff.c
parent1c53290b6739bdc13db9f5eac6f9b8e906557f5f (diff)
downloadffmpeg-9f2ace74ef492b6ba7b4c0cc07f1e29d164f5889.tar.gz
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
Diffstat (limited to 'libavformat/riff.c')
-rw-r--r--libavformat/riff.c4
1 files changed, 2 insertions, 2 deletions
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;