[FFmpeg-devel] [PATCH] s/0/CODEC_ID_NONE

[Carl Eugen Hoyos]

Hi!

There are a few more simple substitutions to silence the icc warning 
"enumerated type mixed with another type".

Please comment, Carl Eugen
-------------- next part --------------
Index: libavformat/img2.c
===================================================================
--- libavformat/img2.c	(revision 13132)
+++ libavformat/img2.c	(working copy)
@@ -68,7 +68,7 @@
     { CODEC_ID_SUNRAST   , "im8"},
     { CODEC_ID_SUNRAST   , "im24"},
     { CODEC_ID_SUNRAST   , "sunras"},
-    {0, NULL}
+    { CODEC_ID_NONE      , NULL}
 };
 
 static int sizes[][2] = {
Index: libavformat/mp3.c
===================================================================
--- libavformat/mp3.c	(revision 13132)
+++ libavformat/mp3.c	(working copy)
@@ -668,7 +668,7 @@
 #endif
     0,
     CODEC_ID_MP2,
-    0,
+    CODEC_ID_NONE,
     NULL,
     mp3_write_packet,
     mp3_write_trailer,
@@ -682,7 +682,7 @@
     "mp3",
     0,
     CODEC_ID_MP3,
-    0,
+    CODEC_ID_NONE,
     mp3_write_header,
     mp3_write_packet,
     mp3_write_trailer,
Index: libavformat/raw.c
===================================================================
--- libavformat/raw.c	(revision 13132)
+++ libavformat/raw.c	(working copy)
@@ -463,7 +463,7 @@
     "flac",
     0,
     CODEC_ID_FLAC,
-    0,
+    CODEC_ID_NONE,
     flac_write_header,
     raw_write_packet,
     .flags= AVFMT_NOTIMESTAMPS,
@@ -493,7 +493,7 @@
     "ac3",
     0,
     CODEC_ID_AC3,
-    0,
+    CODEC_ID_NONE,
     NULL,
     raw_write_packet,
     .flags= AVFMT_NOTIMESTAMPS,
@@ -506,7 +506,7 @@
     "dts",
     0,
     CODEC_ID_DTS,
-    0,
+    CODEC_ID_NONE,
     NULL,
     raw_write_packet,
     .flags= AVFMT_NOTIMESTAMPS,
@@ -533,7 +533,7 @@
     NULL,
     "drc",
     0,
-    0,
+    CODEC_ID_NONE,
     CODEC_ID_DIRAC,
     NULL,
     raw_write_packet,
@@ -615,7 +615,7 @@
     "video/x-h261",
     "h261",
     0,
-    0,
+    CODEC_ID_NONE,
     CODEC_ID_H261,
     NULL,
     raw_write_packet,
@@ -643,7 +643,7 @@
     "video/x-h263",
     "h263",
     0,
-    0,
+    CODEC_ID_NONE,
     CODEC_ID_H263,
     NULL,
     raw_write_packet,
@@ -726,7 +726,7 @@
     "video/x-mpeg",
     "mpg,mpeg,m1v",
     0,
-    0,
+    CODEC_ID_NONE,
     CODEC_ID_MPEG1VIDEO,
     NULL,
     raw_write_packet,
@@ -741,7 +741,7 @@
     NULL,
     "m2v",
     0,
-    0,
+    CODEC_ID_NONE,
     CODEC_ID_MPEG2VIDEO,
     NULL,
     raw_write_packet,
@@ -782,7 +782,7 @@
     "video/x-mjpeg",
     "mjpg,mjpeg",
     0,
-    0,
+    CODEC_ID_NONE,
     CODEC_ID_MJPEG,
     NULL,
     raw_write_packet,
@@ -827,7 +827,7 @@
     ext,\
     0,\
     codec,\
-    0,\
+    CODEC_ID_NONE,\
     NULL,\
     raw_write_packet,\
     .flags= AVFMT_NOTIMESTAMPS,\