From 9f2ace74ef492b6ba7b4c0cc07f1e29d164f5889 Mon Sep 17 00:00:00 2001 From: Carl Eugen Hoyos Date: Mon, 22 Dec 2008 22:12:44 +0000 Subject: 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 --- libavformat/riff.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'libavformat/riff.h') 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[]; -- cgit v1.2.3