diff options
| author | Carl Eugen Hoyos <cehoyos@rainbow.studorg.tuwien.ac.at> | 2008-05-13 15:51:37 +0000 |
|---|---|---|
| committer | Carl Eugen Hoyos <cehoyos@rainbow.studorg.tuwien.ac.at> | 2008-05-13 15:51:37 +0000 |
| commit | 696c30688b1894031005e532126e1cef5221c63c (patch) | |
| tree | a34b1eaaeea83b84f6a8da385d8ce66ce0bef77b /libavformat | |
| parent | e3227b3f25d8dacba271dd60c07e7302a8272f5d (diff) | |
| download | ffmpeg-696c30688b1894031005e532126e1cef5221c63c.tar.gz | |
Fix icc warning #188: enumerated type mixed with another type
Originally committed as revision 13144 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavformat')
| -rw-r--r-- | libavformat/avs.c | 3 | ||||
| -rw-r--r-- | libavformat/electronicarts.c | 4 |
2 files changed, 4 insertions, 3 deletions
diff --git a/libavformat/avs.c b/libavformat/avs.c index b1d6f89e0d..1a493cf797 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 0201e82004..cc6c9f09c4 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; |