RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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
This commit is contained in:
Carl Eugen Hoyos 2008-12-22 22:12:44 +00:00
parent 1c53290b67
commit 9f2ace74ef
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libavformat/riff.c
View File

@ -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;

2
libavformat/riff.h
View File

@ -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[];