Mercurial > libavformat.hg

changeset 3291:fb5f48e1956f libavformat

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix icc warning #188: enumerated type mixed with another type
author cehoyos
date Tue, 13 May 2008 15:51:37 +0000
parents fa502e142b44
children 7100924e2932
files avs.c electronicarts.c
diffstat 2 files changed, 4 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/avs.c	Tue May 13 15:42:27 2008 +0000
+++ b/avs.c	Tue May 13 15:51:37 2008 +0000
@@ -37,6 +37,7 @@
 } avs_format_t;
 
 typedef enum avs_block_type {
+    AVS_NONE      = 0x00,
     AVS_VIDEO     = 0x01,
     AVS_AUDIO     = 0x02,
     AVS_PALETTE   = 0x03,
@@ -142,7 +143,7 @@
 {
     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;
--- a/electronicarts.c	Tue May 13 15:42:27 2008 +0000
+++ b/electronicarts.c	Tue May 13 15:51:37 2008 +0000
@@ -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;