From d9133126d38f426831e2866edaf03c658f41481d Mon Sep 17 00:00:00 2001
From: Carl Eugen Hoyos <cehoyos@rainbow.studorg.tuwien.ac.at>
Date: Mon, 12 May 2008 10:30:40 +0000
Subject: [PATCH] Replace some occurrences of 0 with CODEC_ID_NONE. Fixes icc
 warning #188: enumerated type mixed with another type

Originally committed as revision 13135 to svn://svn.ffmpeg.org/ffmpeg/trunk
---
 libavformat/img2.c |  2 +-
 libavformat/mp3.c  |  4 ++--
 libavformat/raw.c  | 20 ++++++++++----------
 3 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/libavformat/img2.c b/libavformat/img2.c
index 022c6a28c7..4b35454123 100644
--- a/libavformat/img2.c
+++ b/libavformat/img2.c
@@ -68,7 +68,7 @@ static const IdStrMap img_tags[] = {
     { CODEC_ID_SUNRAST   , "im8"},
     { CODEC_ID_SUNRAST   , "im24"},
     { CODEC_ID_SUNRAST   , "sunras"},
-    {0, NULL}
+    { CODEC_ID_NONE      , NULL}
 };
 
 static int sizes[][2] = {
diff --git a/libavformat/mp3.c b/libavformat/mp3.c
index 59cd5f50af..459bf23ea2 100644
--- a/libavformat/mp3.c
+++ b/libavformat/mp3.c
@@ -668,7 +668,7 @@ AVOutputFormat mp2_muxer = {
 #endif
     0,
     CODEC_ID_MP2,
-    0,
+    CODEC_ID_NONE,
     NULL,
     mp3_write_packet,
     mp3_write_trailer,
@@ -682,7 +682,7 @@ AVOutputFormat mp3_muxer = {
     "mp3",
     0,
     CODEC_ID_MP3,
-    0,
+    CODEC_ID_NONE,
     mp3_write_header,
     mp3_write_packet,
     mp3_write_trailer,
diff --git a/libavformat/raw.c b/libavformat/raw.c
index f37758c09d..ed629fa178 100644
--- a/libavformat/raw.c
+++ b/libavformat/raw.c
@@ -463,7 +463,7 @@ AVOutputFormat flac_muxer = {
     "flac",
     0,
     CODEC_ID_FLAC,
-    0,
+    CODEC_ID_NONE,
     flac_write_header,
     raw_write_packet,
     .flags= AVFMT_NOTIMESTAMPS,
@@ -493,7 +493,7 @@ AVOutputFormat ac3_muxer = {
     "ac3",
     0,
     CODEC_ID_AC3,
-    0,
+    CODEC_ID_NONE,
     NULL,
     raw_write_packet,
     .flags= AVFMT_NOTIMESTAMPS,
@@ -506,7 +506,7 @@ AVOutputFormat dts_muxer = {
     "dts",
     0,
     CODEC_ID_DTS,
-    0,
+    CODEC_ID_NONE,
     NULL,
     raw_write_packet,
     .flags= AVFMT_NOTIMESTAMPS,
@@ -533,7 +533,7 @@ AVOutputFormat dirac_muxer = {
     NULL,
     "drc",
     0,
-    0,
+    CODEC_ID_NONE,
     CODEC_ID_DIRAC,
     NULL,
     raw_write_packet,
@@ -615,7 +615,7 @@ AVOutputFormat h261_muxer = {
     "video/x-h261",
     "h261",
     0,
-    0,
+    CODEC_ID_NONE,
     CODEC_ID_H261,
     NULL,
     raw_write_packet,
@@ -643,7 +643,7 @@ AVOutputFormat h263_muxer = {
     "video/x-h263",
     "h263",
     0,
-    0,
+    CODEC_ID_NONE,
     CODEC_ID_H263,
     NULL,
     raw_write_packet,
@@ -726,7 +726,7 @@ AVOutputFormat mpeg1video_muxer = {
     "video/x-mpeg",
     "mpg,mpeg,m1v",
     0,
-    0,
+    CODEC_ID_NONE,
     CODEC_ID_MPEG1VIDEO,
     NULL,
     raw_write_packet,
@@ -741,7 +741,7 @@ AVOutputFormat mpeg2video_muxer = {
     NULL,
     "m2v",
     0,
-    0,
+    CODEC_ID_NONE,
     CODEC_ID_MPEG2VIDEO,
     NULL,
     raw_write_packet,
@@ -782,7 +782,7 @@ AVOutputFormat mjpeg_muxer = {
     "video/x-mjpeg",
     "mjpg,mjpeg",
     0,
-    0,
+    CODEC_ID_NONE,
     CODEC_ID_MJPEG,
     NULL,
     raw_write_packet,
@@ -827,7 +827,7 @@ AVOutputFormat pcm_ ## name ## _muxer = {\
     ext,\
     0,\
     codec,\
-    0,\
+    CODEC_ID_NONE,\
     NULL,\
     raw_write_packet,\
     .flags= AVFMT_NOTIMESTAMPS,\