diff options
| author | Carl Eugen Hoyos <cehoyos@rainbow.studorg.tuwien.ac.at> | 2008-12-22 22:12:44 +0000 |
|---|---|---|
| committer | Carl Eugen Hoyos <cehoyos@rainbow.studorg.tuwien.ac.at> | 2008-12-22 22:12:44 +0000 |
| commit | 9f2ace74ef492b6ba7b4c0cc07f1e29d164f5889 (patch) | |
| tree | c07f92df9e5ddea8c486e3744ebdcda6ff59b268 | |
| parent | 1c53290b6739bdc13db9f5eac6f9b8e906557f5f (diff) | |
| download | ffmpeg-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
| -rw-r--r-- | libavformat/riff.c | 4 | ||||
| -rw-r--r-- | libavformat/riff.h | 2 |
2 files changed, 3 insertions, 3 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; diff --git a/libavformat/riff.h b/libavformat/riff.h index bd4e9f16ae..93c1d71cf3 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[]; |