From 696c30688b1894031005e532126e1cef5221c63c Mon Sep 17 00:00:00 2001
From: Carl Eugen Hoyos <cehoyos@rainbow.studorg.tuwien.ac.at>
Date: Tue, 13 May 2008 15:51:37 +0000
Subject: [PATCH] Fix icc warning #188: enumerated type mixed with another type

Originally committed as revision 13144 to svn://svn.ffmpeg.org/ffmpeg/trunk
---
 libavformat/avs.c            | 3 ++-
 libavformat/electronicarts.c | 4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/libavformat/avs.c b/libavformat/avs.c
index b1d6f89..1a493cf 100644
--- a/libavformat/avs.c
+++ b/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;
diff --git a/libavformat/electronicarts.c b/libavformat/electronicarts.c
index 0201e82..cc6c9f0 100644
--- a/libavformat/electronicarts.c
+++ b/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;
 
-- 
2.7.4