changeset 3766:f062deeedb8d libavformat

Change codec_tag type from const struct AVCodecTag ** to const struct AVCodecTag * const *
author reimar
date Sun, 24 Aug 2008 16:51:50 +0000
parents d55fb12134d1
children 11169564fbdc
files aiff.c asf-enc.c au.c avformat.h avienc.c flvenc.c matroskaenc.c movenc.c nutenc.c oma.c vocdec.c vocenc.c wav.c
diffstat 13 files changed, 24 insertions(+), 24 deletions(-) [+]
line wrap: on
line diff
--- a/aiff.c	Sun Aug 24 16:22:40 2008 +0000
+++ b/aiff.c	Sun Aug 24 16:51:50 2008 +0000
@@ -445,7 +445,7 @@
     aiff_read_packet,
     NULL,
     pcm_read_seek,
-    .codec_tag= (const AVCodecTag*[]){codec_aiff_tags, 0},
+    .codec_tag= (const AVCodecTag* const []){codec_aiff_tags, 0},
 };
 #endif
 
@@ -461,6 +461,6 @@
     aiff_write_header,
     aiff_write_packet,
     aiff_write_trailer,
-    .codec_tag= (const AVCodecTag*[]){codec_aiff_tags, 0},
+    .codec_tag= (const AVCodecTag* const []){codec_aiff_tags, 0},
 };
 #endif
--- a/asf-enc.c	Sun Aug 24 16:22:40 2008 +0000
+++ b/asf-enc.c	Sun Aug 24 16:51:50 2008 +0000
@@ -829,7 +829,7 @@
     asf_write_packet,
     asf_write_trailer,
     .flags = AVFMT_GLOBALHEADER,
-    .codec_tag= (const AVCodecTag*[]){codec_asf_bmp_tags, codec_bmp_tags, codec_wav_tags, 0},
+    .codec_tag= (const AVCodecTag* const []){codec_asf_bmp_tags, codec_bmp_tags, codec_wav_tags, 0},
 };
 #endif
 
@@ -850,6 +850,6 @@
     asf_write_packet,
     asf_write_trailer,
     .flags = AVFMT_GLOBALHEADER,
-    .codec_tag= (const AVCodecTag*[]){codec_asf_bmp_tags, codec_bmp_tags, codec_wav_tags, 0},
+    .codec_tag= (const AVCodecTag* const []){codec_asf_bmp_tags, codec_bmp_tags, codec_wav_tags, 0},
 };
 #endif //CONFIG_ASF_STREAM_MUXER
--- a/au.c	Sun Aug 24 16:22:40 2008 +0000
+++ b/au.c	Sun Aug 24 16:51:50 2008 +0000
@@ -186,7 +186,7 @@
     au_read_packet,
     NULL,
     pcm_read_seek,
-    .codec_tag= (const AVCodecTag*[]){codec_au_tags, 0},
+    .codec_tag= (const AVCodecTag* const []){codec_au_tags, 0},
 };
 #endif
 
@@ -202,6 +202,6 @@
     au_write_header,
     au_write_packet,
     au_write_trailer,
-    .codec_tag= (const AVCodecTag*[]){codec_au_tags, 0},
+    .codec_tag= (const AVCodecTag* const []){codec_au_tags, 0},
 };
 #endif //CONFIG_AU_MUXER
--- a/avformat.h	Sun Aug 24 16:22:40 2008 +0000
+++ b/avformat.h	Sun Aug 24 16:51:50 2008 +0000
@@ -217,7 +217,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;
+    const struct AVCodecTag * const *codec_tag;
 
     enum CodecID subtitle_codec; /**< default subtitle codec */
 
@@ -287,7 +287,7 @@
        (RTSP) */
     int (*read_pause)(struct AVFormatContext *);
 
-    const struct AVCodecTag **codec_tag;
+    const struct AVCodecTag * const *codec_tag;
 
     /* private fields */
     struct AVInputFormat *next;
--- a/avienc.c	Sun Aug 24 16:22:40 2008 +0000
+++ b/avienc.c	Sun Aug 24 16:51:50 2008 +0000
@@ -602,6 +602,6 @@
     avi_write_header,
     avi_write_packet,
     avi_write_trailer,
-    .codec_tag= (const AVCodecTag*[]){codec_bmp_tags, codec_wav_tags, 0},
+    .codec_tag= (const AVCodecTag* const []){codec_bmp_tags, codec_wav_tags, 0},
 };
 #endif //CONFIG_AVI_MUXER
--- a/flvenc.c	Sun Aug 24 16:22:40 2008 +0000
+++ b/flvenc.c	Sun Aug 24 16:51:50 2008 +0000
@@ -387,6 +387,6 @@
     flv_write_header,
     flv_write_packet,
     flv_write_trailer,
-    .codec_tag= (const AVCodecTag*[]){flv_video_codec_ids, flv_audio_codec_ids, 0},
+    .codec_tag= (const AVCodecTag* const []){flv_video_codec_ids, flv_audio_codec_ids, 0},
     .flags= AVFMT_GLOBALHEADER,
 };
--- a/matroskaenc.c	Sun Aug 24 16:22:40 2008 +0000
+++ b/matroskaenc.c	Sun Aug 24 16:51:50 2008 +0000
@@ -846,7 +846,7 @@
     mkv_write_header,
     mkv_write_packet,
     mkv_write_trailer,
-    .codec_tag = (const AVCodecTag*[]){codec_bmp_tags, codec_wav_tags, 0},
+    .codec_tag = (const AVCodecTag* const []){codec_bmp_tags, codec_wav_tags, 0},
     .subtitle_codec = CODEC_ID_TEXT,
 };
 
@@ -861,5 +861,5 @@
     mkv_write_header,
     mkv_write_packet,
     mkv_write_trailer,
-    .codec_tag = (const AVCodecTag*[]){codec_wav_tags, 0},
+    .codec_tag = (const AVCodecTag* const []){codec_wav_tags, 0},
 };
--- a/movenc.c	Sun Aug 24 16:22:40 2008 +0000
+++ b/movenc.c	Sun Aug 24 16:51:50 2008 +0000
@@ -1703,7 +1703,7 @@
     mov_write_packet,
     mov_write_trailer,
     .flags = AVFMT_GLOBALHEADER,
-    .codec_tag = (const AVCodecTag*[]){codec_movvideo_tags, codec_movaudio_tags, 0},
+    .codec_tag = (const AVCodecTag* const []){codec_movvideo_tags, codec_movaudio_tags, 0},
 };
 #endif
 #ifdef CONFIG_TGP_MUXER
@@ -1719,7 +1719,7 @@
     mov_write_packet,
     mov_write_trailer,
     .flags = AVFMT_GLOBALHEADER,
-    .codec_tag = (const AVCodecTag*[]){codec_3gp_tags, 0},
+    .codec_tag = (const AVCodecTag* const []){codec_3gp_tags, 0},
 };
 #endif
 #ifdef CONFIG_MP4_MUXER
@@ -1735,7 +1735,7 @@
     mov_write_packet,
     mov_write_trailer,
     .flags = AVFMT_GLOBALHEADER,
-    .codec_tag = (const AVCodecTag*[]){ff_mp4_obj_type, 0},
+    .codec_tag = (const AVCodecTag* const []){ff_mp4_obj_type, 0},
 };
 #endif
 #ifdef CONFIG_PSP_MUXER
@@ -1751,7 +1751,7 @@
     mov_write_packet,
     mov_write_trailer,
     .flags = AVFMT_GLOBALHEADER,
-    .codec_tag = (const AVCodecTag*[]){ff_mp4_obj_type, 0},
+    .codec_tag = (const AVCodecTag* const []){ff_mp4_obj_type, 0},
 };
 #endif
 #ifdef CONFIG_TG2_MUXER
@@ -1767,7 +1767,7 @@
     mov_write_packet,
     mov_write_trailer,
     .flags = AVFMT_GLOBALHEADER,
-    .codec_tag = (const AVCodecTag*[]){codec_3gp_tags, 0},
+    .codec_tag = (const AVCodecTag* const []){codec_3gp_tags, 0},
 };
 #endif
 #ifdef CONFIG_IPOD_MUXER
@@ -1783,6 +1783,6 @@
     mov_write_packet,
     mov_write_trailer,
     .flags = AVFMT_GLOBALHEADER,
-    .codec_tag = (const AVCodecTag*[]){ff_mp4_obj_type, 0},
+    .codec_tag = (const AVCodecTag* const []){ff_mp4_obj_type, 0},
 };
 #endif
--- a/nutenc.c	Sun Aug 24 16:22:40 2008 +0000
+++ b/nutenc.c	Sun Aug 24 16:51:50 2008 +0000
@@ -820,5 +820,5 @@
     write_packet,
     write_trailer,
     .flags = AVFMT_GLOBALHEADER,
-    .codec_tag= (const AVCodecTag*[]){codec_bmp_tags, codec_wav_tags, ff_nut_subtitle_tags, 0},
+    .codec_tag= (const AVCodecTag* const []){codec_bmp_tags, codec_wav_tags, ff_nut_subtitle_tags, 0},
 };
--- a/oma.c	Sun Aug 24 16:22:40 2008 +0000
+++ b/oma.c	Sun Aug 24 16:51:50 2008 +0000
@@ -195,6 +195,6 @@
     pcm_read_seek,
     .flags= AVFMT_GENERIC_INDEX,
     .extensions = "oma,aa3",
-    .codec_tag= (const AVCodecTag*[]){codec_oma_tags, 0},
+    .codec_tag= (const AVCodecTag* const []){codec_oma_tags, 0},
 };
 
--- a/vocdec.c	Sun Aug 24 16:22:40 2008 +0000
+++ b/vocdec.c	Sun Aug 24 16:51:50 2008 +0000
@@ -141,5 +141,5 @@
     voc_probe,
     voc_read_header,
     voc_read_packet,
-    .codec_tag=(const AVCodecTag*[]){ff_voc_codec_tags, 0},
+    .codec_tag=(const AVCodecTag* const []){ff_voc_codec_tags, 0},
 };
--- a/vocenc.c	Sun Aug 24 16:22:40 2008 +0000
+++ b/vocenc.c	Sun Aug 24 16:51:50 2008 +0000
@@ -99,5 +99,5 @@
     voc_write_header,
     voc_write_packet,
     voc_write_trailer,
-    .codec_tag=(const AVCodecTag*[]){ff_voc_codec_tags, 0},
+    .codec_tag=(const AVCodecTag* const []){ff_voc_codec_tags, 0},
 };
--- a/wav.c	Sun Aug 24 16:22:40 2008 +0000
+++ b/wav.c	Sun Aug 24 16:51:50 2008 +0000
@@ -265,7 +265,7 @@
     NULL,
     wav_read_seek,
     .flags= AVFMT_GENERIC_INDEX,
-    .codec_tag= (const AVCodecTag*[]){codec_wav_tags, 0},
+    .codec_tag= (const AVCodecTag* const []){codec_wav_tags, 0},
 };
 #endif
 #ifdef CONFIG_WAV_MUXER
@@ -280,6 +280,6 @@
     wav_write_header,
     wav_write_packet,
     wav_write_trailer,
-    .codec_tag= (const AVCodecTag*[]){codec_wav_tags, 0},
+    .codec_tag= (const AVCodecTag* const []){codec_wav_tags, 0},
 };
 #endif