changeset 1679:ba58d49d4685 libavformat

get rid of the [4] limitation of codec tag lists

--- a/aiff.c	Sun Jan 21 02:12:34 2007 +0000
+++ b/aiff.c	Sun Jan 21 12:08:31 2007 +0000
@@ -417,7 +417,7 @@
     aiff_read_packet,
     aiff_read_close,
     aiff_read_seek,
-    .codec_tag= {codec_aiff_tags},
+    .codec_tag= (const AVCodecTag*[]){codec_aiff_tags, 0},
 };
 #endif
 
@@ -433,6 +433,6 @@
     aiff_write_header,
     aiff_write_packet,
     aiff_write_trailer,
-    .codec_tag= {codec_aiff_tags},
+    .codec_tag= (const AVCodecTag*[]){codec_aiff_tags, 0},
 };
 #endif

--- a/asf-enc.c	Sun Jan 21 02:12:34 2007 +0000
+++ b/asf-enc.c	Sun Jan 21 12:08:31 2007 +0000
@@ -849,7 +849,7 @@
     asf_write_packet,
     asf_write_trailer,
     .flags = AVFMT_GLOBALHEADER,
-    .codec_tag= {codec_asf_bmp_tags, codec_bmp_tags, codec_wav_tags},
+    .codec_tag= (const AVCodecTag*[]){codec_asf_bmp_tags, codec_bmp_tags, codec_wav_tags, 0},
 };
 #endif
 
@@ -870,6 +870,6 @@
     asf_write_packet,
     asf_write_trailer,
     .flags = AVFMT_GLOBALHEADER,
-    .codec_tag= {codec_asf_bmp_tags, codec_bmp_tags, codec_wav_tags},
+    .codec_tag= (const AVCodecTag*[]){codec_asf_bmp_tags, codec_bmp_tags, codec_wav_tags, 0},
 };
 #endif //CONFIG_ASF_STREAM_MUXER

--- a/au.c	Sun Jan 21 02:12:34 2007 +0000
+++ b/au.c	Sun Jan 21 12:08:31 2007 +0000
@@ -190,7 +190,7 @@
     au_read_packet,
     au_read_close,
     pcm_read_seek,
-    .codec_tag= {codec_au_tags},
+    .codec_tag= (const AVCodecTag*[]){codec_au_tags, 0},
 };
 #endif
 
@@ -206,6 +206,6 @@
     au_write_header,
     au_write_packet,
     au_write_trailer,
-    .codec_tag= {codec_au_tags},
+    .codec_tag= (const AVCodecTag*[]){codec_au_tags, 0},
 };
 #endif //CONFIG_AU_MUXER

--- a/avformat.h	Sun Jan 21 02:12:34 2007 +0000
+++ b/avformat.h	Sun Jan 21 12:08:31 2007 +0000
@@ -162,7 +162,7 @@
      * list of supported codec_id-codec_tag pairs, ordered by "better choice first"
      * the arrays are all CODEC_ID_NONE terminated
      */
-    const struct AVCodecTag *codec_tag[4];
+    const struct AVCodecTag **codec_tag;
 
     /* private fields */
     struct AVOutputFormat *next;
@@ -219,7 +219,7 @@
        (RTSP) */
     int (*read_pause)(struct AVFormatContext *);
 
-    const struct AVCodecTag *codec_tag[4];
+    const struct AVCodecTag **codec_tag;
 
     /* private fields */
     struct AVInputFormat *next;
@@ -408,8 +408,8 @@
 void av_register_all(void);
 
 /* codec tag <-> codec id */
-enum CodecID av_codec_get_id(const struct AVCodecTag *tags[4], unsigned int tag);
-unsigned int av_codec_get_tag(const struct AVCodecTag *tags[4], enum CodecID id);
+enum CodecID av_codec_get_id(const struct AVCodecTag **tags, unsigned int tag);
+unsigned int av_codec_get_tag(const struct AVCodecTag **tags, enum CodecID id);
 
 /* media file input */
 AVInputFormat *av_find_input_format(const char *short_name);

--- a/avienc.c	Sun Jan 21 02:12:34 2007 +0000
+++ b/avienc.c	Sun Jan 21 12:08:31 2007 +0000
@@ -575,6 +575,6 @@
     avi_write_header,
     avi_write_packet,
     avi_write_trailer,
-    .codec_tag= {codec_bmp_tags, codec_wav_tags},
+    .codec_tag= (const AVCodecTag*[]){codec_bmp_tags, codec_wav_tags, 0},
 };
 #endif //CONFIG_AVI_MUXER

--- a/flvenc.c	Sun Jan 21 02:12:34 2007 +0000
+++ b/flvenc.c	Sun Jan 21 12:08:31 2007 +0000
@@ -332,5 +332,5 @@
     flv_write_header,
     flv_write_packet,
     flv_write_trailer,
-    .codec_tag= {flv_video_codec_ids, flv_audio_codec_ids},
+    .codec_tag= (const AVCodecTag*[]){flv_video_codec_ids, flv_audio_codec_ids, 0},
 };

--- a/riff.c	Sun Jan 21 02:12:34 2007 +0000
+++ b/riff.c	Sun Jan 21 12:08:31 2007 +0000
@@ -233,7 +233,7 @@
 unsigned int av_codec_get_tag(const AVCodecTag *tags[4], enum CodecID id)
 {
     int i;
-    for(i=0; i<4 && tags[i]; i++){
+    for(i=0; tags && tags[i]; i++){
         int tag= codec_get_tag(tags[i], id);
         if(tag) return tag;
     }
@@ -243,7 +243,7 @@
 enum CodecID av_codec_get_id(const AVCodecTag *tags[4], unsigned int tag)
 {
     int i;
-    for(i=0; i<4 && tags[i]; i++){
+    for(i=0; tags && tags[i]; i++){
         enum CodecID id= codec_get_id(tags[i], tag);
         if(id!=CODEC_ID_NONE) return id;
     }

--- a/vocdec.c	Sun Jan 21 02:12:34 2007 +0000
+++ b/vocdec.c	Sun Jan 21 12:08:31 2007 +0000
@@ -152,5 +152,5 @@
     voc_read_header,
     voc_read_packet,
     voc_read_close,
-    .codec_tag={voc_codec_tags},
+    .codec_tag=(const AVCodecTag*[]){voc_codec_tags, 0},
 };

--- a/vocenc.c	Sun Jan 21 02:12:34 2007 +0000
+++ b/vocenc.c	Sun Jan 21 12:08:31 2007 +0000
@@ -101,5 +101,5 @@
     voc_write_header,
     voc_write_packet,
     voc_write_trailer,
-    .codec_tag={voc_codec_tags},
+    .codec_tag=(const AVCodecTag*[]){voc_codec_tags, 0},
 };

--- a/wav.c	Sun Jan 21 02:12:34 2007 +0000
+++ b/wav.c	Sun Jan 21 12:08:31 2007 +0000
@@ -235,7 +235,7 @@
     wav_read_packet,
     wav_read_close,
     wav_read_seek,
-    .codec_tag= {codec_wav_tags},
+    .codec_tag= (const AVCodecTag*[]){codec_wav_tags, 0},
 };
 #endif
 #ifdef CONFIG_WAV_MUXER
@@ -250,6 +250,6 @@
     wav_write_header,
     wav_write_packet,
     wav_write_trailer,
-    .codec_tag= {codec_wav_tags},
+    .codec_tag= (const AVCodecTag*[]){codec_wav_tags, 0},
 };
 #endif