[FFmpeg-cvslog] r13144 - in trunk/libavformat: avs.c electronicarts.c
cehoyos
subversion
Tue May 13 17:51:37 CEST 2008
Author: cehoyos
Date: Tue May 13 17:51:37 2008
New Revision: 13144
Log:
Fix icc warning #188: enumerated type mixed with another type
Modified:
trunk/libavformat/avs.c
trunk/libavformat/electronicarts.c
Modified: trunk/libavformat/avs.c
==============================================================================
--- trunk/libavformat/avs.c (original)
+++ trunk/libavformat/avs.c Tue May 13 17:51:37 2008
@@ -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(AVFormatConte
{
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;
Modified: trunk/libavformat/electronicarts.c
==============================================================================
--- trunk/libavformat/electronicarts.c (original)
+++ trunk/libavformat/electronicarts.c Tue May 13 17:51:37 2008
@@ -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;
More information about the ffmpeg-cvslog
mailing list