[FFmpeg-cvslog] r14947 - in trunk/libavformat: 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
reimar
subversion
Sun Aug 24 18:51:50 CEST 2008
Author: reimar
Date: Sun Aug 24 18:51:50 2008
New Revision: 14947
Log:
Change codec_tag type from const struct AVCodecTag ** to const struct AVCodecTag * const *
Modified:
trunk/libavformat/aiff.c
trunk/libavformat/asf-enc.c
trunk/libavformat/au.c
trunk/libavformat/avformat.h
trunk/libavformat/avienc.c
trunk/libavformat/flvenc.c
trunk/libavformat/matroskaenc.c
trunk/libavformat/movenc.c
trunk/libavformat/nutenc.c
trunk/libavformat/oma.c
trunk/libavformat/vocdec.c
trunk/libavformat/vocenc.c
trunk/libavformat/wav.c
Modified: trunk/libavformat/aiff.c
==============================================================================
--- trunk/libavformat/aiff.c (original)
+++ trunk/libavformat/aiff.c Sun Aug 24 18:51:50 2008
@@ -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
Modified: trunk/libavformat/asf-enc.c
==============================================================================
--- trunk/libavformat/asf-enc.c (original)
+++ trunk/libavformat/asf-enc.c Sun Aug 24 18:51:50 2008
@@ -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
Modified: trunk/libavformat/au.c
==============================================================================
--- trunk/libavformat/au.c (original)
+++ trunk/libavformat/au.c Sun Aug 24 18:51:50 2008
@@ -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
Modified: trunk/libavformat/avformat.h
==============================================================================
--- trunk/libavformat/avformat.h (original)
+++ trunk/libavformat/avformat.h Sun Aug 24 18:51:50 2008
@@ -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;
Modified: trunk/libavformat/avienc.c
==============================================================================
--- trunk/libavformat/avienc.c (original)
+++ trunk/libavformat/avienc.c Sun Aug 24 18:51:50 2008
@@ -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
Modified: trunk/libavformat/flvenc.c
==============================================================================
--- trunk/libavformat/flvenc.c (original)
+++ trunk/libavformat/flvenc.c Sun Aug 24 18:51:50 2008
@@ -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,
};
Modified: trunk/libavformat/matroskaenc.c
==============================================================================
--- trunk/libavformat/matroskaenc.c (original)
+++ trunk/libavformat/matroskaenc.c Sun Aug 24 18:51:50 2008
@@ -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},
};
Modified: trunk/libavformat/movenc.c
==============================================================================
--- trunk/libavformat/movenc.c (original)
+++ trunk/libavformat/movenc.c Sun Aug 24 18:51:50 2008
@@ -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
Modified: trunk/libavformat/nutenc.c
==============================================================================
--- trunk/libavformat/nutenc.c (original)
+++ trunk/libavformat/nutenc.c Sun Aug 24 18:51:50 2008
@@ -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},
};
Modified: trunk/libavformat/oma.c
==============================================================================
--- trunk/libavformat/oma.c (original)
+++ trunk/libavformat/oma.c Sun Aug 24 18:51:50 2008
@@ -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},
};
Modified: trunk/libavformat/vocdec.c
==============================================================================
--- trunk/libavformat/vocdec.c (original)
+++ trunk/libavformat/vocdec.c Sun Aug 24 18:51:50 2008
@@ -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},
};
Modified: trunk/libavformat/vocenc.c
==============================================================================
--- trunk/libavformat/vocenc.c (original)
+++ trunk/libavformat/vocenc.c Sun Aug 24 18:51:50 2008
@@ -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},
};
Modified: trunk/libavformat/wav.c
==============================================================================
--- trunk/libavformat/wav.c (original)
+++ trunk/libavformat/wav.c Sun Aug 24 18:51:50 2008
@@ -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
More information about the ffmpeg-cvslog
mailing list