@@ -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

@@ -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 },

 };

@@ -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/"

@@ -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[] = {

@@ -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);

@@ -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

@@ -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;

@@ -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 */

@@ -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},

 };