changeset 4128:e51ace85da6c libavformat

Fix a warning when compiling with icc: warning #188: enumerated type mixed with another type
author cehoyos
date Mon, 22 Dec 2008 22:10:07 +0000
parents 6afa3d7c206e
children 0116c7e7e3ef
files ipmovie.c
diffstat 1 files changed, 2 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/ipmovie.c	Mon Dec 22 11:23:00 2008 +0000
+++ b/ipmovie.c	Mon Dec 22 22:10:07 2008 +0000
@@ -101,7 +101,7 @@
     unsigned int audio_bits;
     unsigned int audio_channels;
     unsigned int audio_sample_rate;
-    unsigned int audio_type;
+    enum CodecID audio_type;
     unsigned int audio_frame_count;
 
     int video_stream_index;
@@ -544,7 +544,7 @@
     url_fseek(pb, -CHUNK_PREAMBLE_SIZE, SEEK_CUR);
 
     if (chunk_type == CHUNK_VIDEO)
-        ipmovie->audio_type = 0;  /* no audio */
+        ipmovie->audio_type = CODEC_ID_NONE;  /* no audio */
     else if (process_ipmovie_chunk(ipmovie, pb, &pkt) != CHUNK_INIT_AUDIO)
         return AVERROR_INVALIDDATA;