[FFmpeg-cvslog] [commit] r16280 - trunk/libavformat/ipmovie.c

[cehoyos]

Author: cehoyos
Date: Mon Dec 22 23:10:07 2008
New Revision: 16280

Log:
Fix a warning when compiling with icc:
warning #188: enumerated type mixed with another type

Modified:
   trunk/libavformat/ipmovie.c

Modified: trunk/libavformat/ipmovie.c
==============================================================================
--- trunk/libavformat/ipmovie.c	Mon Dec 22 18:14:13 2008	(r16279)
+++ trunk/libavformat/ipmovie.c	Mon Dec 22 23:10:07 2008	(r16280)
@@ -101,7 +101,7 @@ typedef struct IPMVEContext {
     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 @@ static int ipmovie_read_header(AVFormatC
     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;