From c18545929e134845ff57e3e98f494965e42ab10a Mon Sep 17 00:00:00 2001 From: =?utf8?q?Reimar=20D=C3=B6ffinger?= Date: Sun, 24 Aug 2008 16:51:50 +0000 Subject: [PATCH] Change codec_tag type from const struct AVCodecTag ** to const struct AVCodecTag * const * Originally committed as revision 14947 to svn://svn.ffmpeg.org/ffmpeg/trunk --- libavformat/aiff.c | 4 ++-- libavformat/asf-enc.c | 4 ++-- libavformat/au.c | 4 ++-- libavformat/avformat.h | 4 ++-- libavformat/avienc.c | 2 +- libavformat/flvenc.c | 2 +- libavformat/matroskaenc.c | 4 ++-- libavformat/movenc.c | 12 ++++++------ libavformat/nutenc.c | 2 +- libavformat/oma.c | 2 +- libavformat/vocdec.c | 2 +- libavformat/vocenc.c | 2 +- libavformat/wav.c | 4 ++-- 13 files changed, 24 insertions(+), 24 deletions(-) diff --git a/libavformat/aiff.c b/libavformat/aiff.c index 3dabbb8..079e8b9 100644 --- a/libavformat/aiff.c +++ b/libavformat/aiff.c @@ -445,7 +445,7 @@ AVInputFormat aiff_demuxer = { 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 @@ AVOutputFormat aiff_muxer = { 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 diff --git a/libavformat/asf-enc.c b/libavformat/asf-enc.c index 1817db0..53c2afc 100644 --- a/libavformat/asf-enc.c +++ b/libavformat/asf-enc.c @@ -829,7 +829,7 @@ AVOutputFormat asf_muxer = { 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 @@ AVOutputFormat asf_stream_muxer = { 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 diff --git a/libavformat/au.c b/libavformat/au.c index 2f12f32..2fb5fa0 100644 --- a/libavformat/au.c +++ b/libavformat/au.c @@ -186,7 +186,7 @@ AVInputFormat au_demuxer = { 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 @@ AVOutputFormat au_muxer = { 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 diff --git a/libavformat/avformat.h b/libavformat/avformat.h index 09c4656..624266c 100644 --- a/libavformat/avformat.h +++ b/libavformat/avformat.h @@ -217,7 +217,7 @@ typedef struct AVOutputFormat { * 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 @@ typedef struct AVInputFormat { (RTSP) */ int (*read_pause)(struct AVFormatContext *); - const struct AVCodecTag **codec_tag; + const struct AVCodecTag * const *codec_tag; /* private fields */ struct AVInputFormat *next; diff --git a/libavformat/avienc.c b/libavformat/avienc.c index 3dabd3a..559e8ab 100644 --- a/libavformat/avienc.c +++ b/libavformat/avienc.c @@ -602,6 +602,6 @@ AVOutputFormat avi_muxer = { 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 diff --git a/libavformat/flvenc.c b/libavformat/flvenc.c index 2941356..d496d93 100644 --- a/libavformat/flvenc.c +++ b/libavformat/flvenc.c @@ -387,6 +387,6 @@ AVOutputFormat flv_muxer = { 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, }; diff --git a/libavformat/matroskaenc.c b/libavformat/matroskaenc.c index 9346e9c..db090be 100644 --- a/libavformat/matroskaenc.c +++ b/libavformat/matroskaenc.c @@ -846,7 +846,7 @@ AVOutputFormat matroska_muxer = { 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 @@ AVOutputFormat matroska_audio_muxer = { 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}, }; diff --git a/libavformat/movenc.c b/libavformat/movenc.c index 5e3b34a..0343be3 100644 --- a/libavformat/movenc.c +++ b/libavformat/movenc.c @@ -1703,7 +1703,7 @@ AVOutputFormat mov_muxer = { 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 @@ AVOutputFormat tgp_muxer = { 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 @@ AVOutputFormat mp4_muxer = { 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 @@ AVOutputFormat psp_muxer = { 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 @@ AVOutputFormat tg2_muxer = { 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 @@ AVOutputFormat ipod_muxer = { 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 diff --git a/libavformat/nutenc.c b/libavformat/nutenc.c index 7bb826a..478fc4f 100644 --- a/libavformat/nutenc.c +++ b/libavformat/nutenc.c @@ -820,5 +820,5 @@ AVOutputFormat nut_muxer = { 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}, }; diff --git a/libavformat/oma.c b/libavformat/oma.c index 653f413..de632ff 100644 --- a/libavformat/oma.c +++ b/libavformat/oma.c @@ -195,6 +195,6 @@ AVInputFormat oma_demuxer = { 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}, }; diff --git a/libavformat/vocdec.c b/libavformat/vocdec.c index afba3c5..178ecb5 100644 --- a/libavformat/vocdec.c +++ b/libavformat/vocdec.c @@ -141,5 +141,5 @@ AVInputFormat voc_demuxer = { 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}, }; diff --git a/libavformat/vocenc.c b/libavformat/vocenc.c index 88fc41c..0802f50 100644 --- a/libavformat/vocenc.c +++ b/libavformat/vocenc.c @@ -99,5 +99,5 @@ AVOutputFormat voc_muxer = { 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}, }; diff --git a/libavformat/wav.c b/libavformat/wav.c index 945ee39..de88b46 100644 --- a/libavformat/wav.c +++ b/libavformat/wav.c @@ -265,7 +265,7 @@ AVInputFormat wav_demuxer = { 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 @@ AVOutputFormat wav_muxer = { 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 -- 2.7.4