From: Carl Eugen Hoyos <cehoyos@rainbow.studorg.tuwien.ac.at>
Date: Mon, 22 Dec 2008 22:12:44 +0000 (+0000)
Subject: Fix two identical warnings when compiling riff.c and nuv.c with icc:
X-Git-Tag: v0.5~1510
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=9f2ace74ef492b6ba7b4c0cc07f1e29d164f5889;p=platform%2Fupstream%2Flibav.git

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 7c40c6f..047af0a 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;
diff --git a/libavformat/riff.h b/libavformat/riff.h
index bd4e9f1..93c1d71 100644
--- 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[];