Commit 8bb7567e authored by cehoyos's avatar cehoyos

Fix two identical warnings when compiling riff.c and nuv.c with icc:

warning #188: enumerated type mixed with another type



git-svn-id: file:///var/local/repositories/ffmpeg/trunk@16281 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b
parent 83c43db5
...@@ -425,9 +425,9 @@ void get_wav_header(ByteIOContext *pb, AVCodecContext *codec, int size) ...@@ -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); id = codec_get_id(codec_wav_tags, tag);
if (id <= 0) if (id <= 0)
return id; return id;
......
...@@ -41,7 +41,7 @@ typedef struct AVCodecTag { ...@@ -41,7 +41,7 @@ typedef struct AVCodecTag {
void put_bmp_header(ByteIOContext *pb, AVCodecContext *enc, const AVCodecTag *tags, int for_asf); void put_bmp_header(ByteIOContext *pb, AVCodecContext *enc, const AVCodecTag *tags, int for_asf);
int put_wav_header(ByteIOContext *pb, AVCodecContext *enc); 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); void get_wav_header(ByteIOContext *pb, AVCodecContext *codec, int size);
extern const AVCodecTag codec_bmp_tags[]; extern const AVCodecTag codec_bmp_tags[];
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment