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

diff --git a/libavformat/riff.c b/libavformat/riff.c
index 7c40c6f2ca188655d155f5cc576d167ea4653133..047af0ab611f3f2e04ade44995f2652eb8881ae0 100644 (file)
--- 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;

diff --git a/libavformat/riff.h b/libavformat/riff.h
index bd4e9f16ae3e9beefe9c26f0fef760455c898d7b..93c1d71cf3db6a23aaf52ef2209e9c5141304e38 100644 (file)
--- a/libavformat/riff.h
+++ b/libavformat/riff.h
@@ -41,7 +41,7 @@ typedef struct AVCodecTag {
 
 void put_bmp_header(ByteIOContext *pb, AVCodecContext *enc, const AVCodecTag *tags, int for_asf);
 int put_wav_header(ByteIOContext *pb, AVCodecContext *enc);
-int wav_codec_get_id(unsigned int tag, int bps);
+enum CodecID wav_codec_get_id(unsigned int tag, int bps);
 void get_wav_header(ByteIOContext *pb, AVCodecContext *codec, int size);
 
 extern const AVCodecTag codec_bmp_tags[];