Mercurial > libavformat.hg

changeset 4129:0116c7e7e3ef libavformat

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix two identical warnings when compiling riff.c and nuv.c with icc: warning #188: enumerated type mixed with another type
author cehoyos
date Mon, 22 Dec 2008 22:12:44 +0000
parents e51ace85da6c
children 22a0dae5e6ae
files riff.c riff.h
diffstat 2 files changed, 3 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/riff.c	Mon Dec 22 22:10:07 2008 +0000
+++ b/riff.c	Mon Dec 22 22:12:44 2008 +0000
@@ -425,9 +425,9 @@
 }
 
 
-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;
--- a/riff.h	Mon Dec 22 22:10:07 2008 +0000
+++ b/riff.h	Mon Dec 22 22:12:44 2008 +0000
@@ -41,7 +41,7 @@
 
 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[];