[FFmpeg-cvslog] r16281 - trunk/libavformat
cehoyos
subversion
Tue Dec 23 09:43:40 CET 2008
Author: cehoyos
Date: Mon Dec 22 23:12:44 2008
New Revision: 16281
Log:
Fix two identical warnings when compiling riff.c and nuv.c with icc:
warning #188: enumerated type mixed with another type
Modified:
trunk/libavformat/riff.c
trunk/libavformat/riff.h
Modified: trunk/libavformat/riff.c
==============================================================================
--- trunk/libavformat/riff.c Mon Dec 22 23:10:07 2008 (r16280)
+++ trunk/libavformat/riff.c Mon Dec 22 23:12:44 2008 (r16281)
@@ -425,9 +425,9 @@ void get_wav_header(ByteIOContext *pb, A
}
-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;
Modified: trunk/libavformat/riff.h
==============================================================================
--- trunk/libavformat/riff.h Mon Dec 22 23:10:07 2008 (r16280)
+++ trunk/libavformat/riff.h Mon Dec 22 23:12:44 2008 (r16281)
@@ -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[];
More information about the ffmpeg-cvslog
mailing list