From bc2d2a07d5bf1b6d13b16e106413c7e62979dcc1 Mon Sep 17 00:00:00 2001
From: Carl Eugen Hoyos <cehoyos@rainbow.studorg.tuwien.ac.at>
Date: Fri, 16 Oct 2009 14:46:06 +0000
Subject: [PATCH] Make AVCodecTag.id enum CodecID and use CODEC_ID_NONE instead
 of 0.

Originally committed as revision 20250 to svn://svn.ffmpeg.org/ffmpeg/trunk
---
 libavformat/au.c     | 2 +-
 libavformat/caf.c    | 2 +-
 libavformat/gxfenc.c | 2 +-
 libavformat/isom.c   | 2 +-
 libavformat/nsvdec.c | 4 ++--
 libavformat/riff.c   | 2 +-
 libavformat/riff.h   | 2 +-
 libavformat/swf.h    | 4 ++--
 libavformat/voc.c    | 2 +-
 9 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/libavformat/au.c b/libavformat/au.c
index 24bdb62c7c..7f119e9a4c 100644
--- a/libavformat/au.c
+++ b/libavformat/au.c
@@ -44,7 +44,7 @@ static const AVCodecTag codec_au_tags[] = {
     { CODEC_ID_PCM_F32BE, 6 },
     { CODEC_ID_PCM_F64BE, 7 },
     { CODEC_ID_PCM_ALAW, 27 },
-    { 0, 0 },
+    { CODEC_ID_NONE, 0 },
 };
 
 #if CONFIG_AU_MUXER
diff --git a/libavformat/caf.c b/libavformat/caf.c
index 98f7f78fa3..931a779469 100644
--- a/libavformat/caf.c
+++ b/libavformat/caf.c
@@ -54,5 +54,5 @@ const AVCodecTag ff_codec_caf_tags[] = {
   /*{ MPEG4CELP                 MKBETAG('c','e','l','p') },*/
   /*{ MPEG4HVXC                 MKBETAG('h','v','x','c') },*/
   /*{ MPEG4TwinVQ               MKBETAG('t','w','v','q') },*/
-    { 0, 0 },
+    { CODEC_ID_NONE,            0 },
 };
diff --git a/libavformat/gxfenc.c b/libavformat/gxfenc.c
index 501691e78d..603f595b32 100644
--- a/libavformat/gxfenc.c
+++ b/libavformat/gxfenc.c
@@ -93,7 +93,7 @@ static const AVCodecTag gxf_media_types[] = {
     { CODEC_ID_MPEG2VIDEO,  20 }, /* MPEG HD */
     { CODEC_ID_MPEG1VIDEO,  22 }, /* NTSC */
     { CODEC_ID_MPEG1VIDEO,  23 }, /* PAL */
-    { 0, 0 },
+    { CODEC_ID_NONE,         0 },
 };
 
 #define SERVER_PATH "EXT:/PDR/default/"
diff --git a/libavformat/isom.c b/libavformat/isom.c
index 23d716fef3..f6b504d4d3 100644
--- a/libavformat/isom.c
+++ b/libavformat/isom.c
@@ -54,7 +54,7 @@ const AVCodecTag ff_mp4_obj_type[] = {
     { CODEC_ID_VORBIS    , 0xDD }, /* non standard, gpac uses it */
     { CODEC_ID_DVD_SUBTITLE, 0xE0 }, /* non standard, see unsupported-embedded-subs-2.mp4 */
     { CODEC_ID_QCELP     , 0xE1 },
-    { 0, 0 },
+    { CODEC_ID_NONE      ,    0 },
 };
 
 const AVCodecTag codec_movvideo_tags[] = {
diff --git a/libavformat/nsvdec.c b/libavformat/nsvdec.c
index 61a21ae178..9c215cd58f 100644
--- a/libavformat/nsvdec.c
+++ b/libavformat/nsvdec.c
@@ -201,7 +201,7 @@ static const AVCodecTag nsv_codec_video_tags[] = {
 */
     { CODEC_ID_MPEG4, MKTAG('X', 'V', 'I', 'D') }, /* cf sample xvid decoder from nsv_codec_sdk.zip */
     { CODEC_ID_RAWVIDEO, MKTAG('R', 'G', 'B', '3') },
-    { 0, 0 },
+    { CODEC_ID_NONE, 0 },
 };
 
 static const AVCodecTag nsv_codec_audio_tags[] = {
@@ -210,7 +210,7 @@ static const AVCodecTag nsv_codec_audio_tags[] = {
     { CODEC_ID_AAC,       MKTAG('A', 'A', 'C', 'P') },
     { CODEC_ID_SPEEX,     MKTAG('S', 'P', 'X', ' ') },
     { CODEC_ID_PCM_U16LE, MKTAG('P', 'C', 'M', ' ') },
-    { 0, 0 },
+    { CODEC_ID_NONE,      0 },
 };
 
 //static int nsv_load_index(AVFormatContext *s);
diff --git a/libavformat/riff.c b/libavformat/riff.c
index c5506d9b8b..b6feb13353 100644
--- a/libavformat/riff.c
+++ b/libavformat/riff.c
@@ -271,7 +271,7 @@ const AVCodecTag ff_codec_wav_tags[] = {
     { CODEC_ID_PCM_S16LE, MKTAG('R', 'A', 'W', 'A') },
     { CODEC_ID_MP3,       MKTAG('L', 'A', 'M', 'E') },
     { CODEC_ID_MP3,       MKTAG('M', 'P', '3', ' ') },
-    { 0, 0 },
+    { CODEC_ID_NONE,      0 },
 };
 
 #if CONFIG_MUXERS
diff --git a/libavformat/riff.h b/libavformat/riff.h
index eac0d25470..876c22f31b 100644
--- a/libavformat/riff.h
+++ b/libavformat/riff.h
@@ -35,7 +35,7 @@ int64_t ff_start_tag(ByteIOContext *pb, const char *tag);
 void ff_end_tag(ByteIOContext *pb, int64_t start);
 
 typedef struct AVCodecTag {
-    int id;
+    enum CodecID id;
     unsigned int tag;
 } AVCodecTag;
 
diff --git a/libavformat/swf.h b/libavformat/swf.h
index 69064a281c..affebe9c73 100644
--- a/libavformat/swf.h
+++ b/libavformat/swf.h
@@ -81,7 +81,7 @@ typedef struct {
 static const AVCodecTag swf_codec_tags[] = {
     {CODEC_ID_FLV1, 0x02},
     {CODEC_ID_VP6F, 0x04},
-    {0, 0},
+    {CODEC_ID_NONE,    0},
 };
 
 static const AVCodecTag swf_audio_codec_tags[] = {
@@ -90,7 +90,7 @@ static const AVCodecTag swf_audio_codec_tags[] = {
     {CODEC_ID_MP3,        0x02},
     {CODEC_ID_PCM_S16LE,  0x03},
   //{CODEC_ID_NELLYMOSER, 0x06},
-    {0, 0},
+    {CODEC_ID_NONE,          0},
 };
 
 #endif /* AVFORMAT_SWF_H */
diff --git a/libavformat/voc.c b/libavformat/voc.c
index 7ebfa711c9..eed8db8cc7 100644
--- a/libavformat/voc.c
+++ b/libavformat/voc.c
@@ -32,5 +32,5 @@ const AVCodecTag ff_voc_codec_tags[] = {
     {CODEC_ID_PCM_ALAW,      0x06},
     {CODEC_ID_PCM_MULAW,     0x07},
     {CODEC_ID_ADPCM_CT,    0x0200},
-    {0, 0},
+    {CODEC_ID_NONE,             0},
 };