Fix icc warning #188: enumerated type mixed with another type

git-svn-id: file:///var/local/repositories/ffmpeg/trunk@13144 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b

libavformat/avs.c

@@ -37,6 +37,7 @@ typedef struct avs_format {
 } avs_format_t;
 
 typedef enum avs_block_type {
+    AVS_NONE      = 0x00,
     AVS_VIDEO     = 0x01,
     AVS_AUDIO     = 0x02,
     AVS_PALETTE   = 0x03,
@@ -142,7 +143,7 @@ static int avs_read_packet(AVFormatContext * s, AVPacket * pkt)
 {
     avs_format_t *avs = s->priv_data;
     int sub_type = 0, size = 0;
-    avs_block_type_t type = 0;
+    avs_block_type_t type = AVS_NONE;
     int palette_size = 0;
     uint8_t palette[4 + 3 * 256];
     int ret;

libavformat/electronicarts.c

@@ -49,11 +49,11 @@
 typedef struct EaDemuxContext {
     int big_endian;
 
-    int video_codec;
+    enum CodecID video_codec;
     AVRational time_base;
     int video_stream_index;
 
-    int audio_codec;
+    enum CodecID audio_codec;
     int audio_stream_index;
     int audio_frame_counter;