mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2024-11-26 19:01:44 +02:00
cosmetics: Align muxer/demuxer declarations
Also add missing trailing commas, break long codec_tag lines and add spaces in codec_tag declarations. Signed-off-by: Martin Storsjö <martin@martin.st>
This commit is contained in:
parent
fdf3a749d3
commit
20234a4bd7
@ -171,5 +171,5 @@ AVOutputFormat ff_a64_muxer = {
|
||||
.video_codec = CODEC_ID_A64_MULTI,
|
||||
.write_header = a64_write_header,
|
||||
.write_packet = a64_write_packet,
|
||||
.write_trailer = a64_write_trailer
|
||||
.write_trailer = a64_write_trailer,
|
||||
};
|
||||
|
@ -438,5 +438,5 @@ AVInputFormat ff_ape_demuxer = {
|
||||
.read_packet = ape_read_packet,
|
||||
.read_close = ape_read_close,
|
||||
.read_seek = ape_read_seek,
|
||||
.extensions = "ape,apl,mac"
|
||||
.extensions = "ape,apl,mac",
|
||||
};
|
||||
|
@ -894,7 +894,9 @@ AVOutputFormat ff_asf_muxer = {
|
||||
.write_packet = asf_write_packet,
|
||||
.write_trailer = asf_write_trailer,
|
||||
.flags = AVFMT_GLOBALHEADER,
|
||||
.codec_tag= (const AVCodecTag* const []){codec_asf_bmp_tags, ff_codec_bmp_tags, ff_codec_wav_tags, 0},
|
||||
.codec_tag = (const AVCodecTag* const []){
|
||||
codec_asf_bmp_tags, ff_codec_bmp_tags, ff_codec_wav_tags, 0
|
||||
},
|
||||
};
|
||||
#endif
|
||||
|
||||
@ -915,6 +917,8 @@ AVOutputFormat ff_asf_stream_muxer = {
|
||||
.write_packet = asf_write_packet,
|
||||
.write_trailer = asf_write_trailer,
|
||||
.flags = AVFMT_GLOBALHEADER,
|
||||
.codec_tag= (const AVCodecTag* const []){codec_asf_bmp_tags, ff_codec_bmp_tags, ff_codec_wav_tags, 0},
|
||||
.codec_tag = (const AVCodecTag* const []){
|
||||
codec_asf_bmp_tags, ff_codec_bmp_tags, ff_codec_wav_tags, 0
|
||||
},
|
||||
};
|
||||
#endif //CONFIG_ASF_STREAM_MUXER
|
||||
|
@ -654,6 +654,8 @@ AVOutputFormat ff_avi_muxer = {
|
||||
.write_header = avi_write_header,
|
||||
.write_packet = avi_write_packet,
|
||||
.write_trailer = avi_write_trailer,
|
||||
.codec_tag= (const AVCodecTag* const []){ff_codec_bmp_tags, ff_codec_wav_tags, 0},
|
||||
.codec_tag = (const AVCodecTag* const []){
|
||||
ff_codec_bmp_tags, ff_codec_wav_tags, 0
|
||||
},
|
||||
.flags = AVFMT_VARIABLE_FPS,
|
||||
};
|
||||
|
@ -133,5 +133,5 @@ AVInputFormat ff_bmv_demuxer = {
|
||||
.read_header = bmv_read_header,
|
||||
.read_packet = bmv_read_packet,
|
||||
.read_close = bmv_read_close,
|
||||
.extensions = "bmv"
|
||||
.extensions = "bmv",
|
||||
};
|
||||
|
@ -68,5 +68,5 @@ AVInputFormat ff_cdg_demuxer = {
|
||||
.long_name = NULL_IF_CONFIG_SMALL("CD Graphics Format"),
|
||||
.read_header = read_header,
|
||||
.read_packet = read_packet,
|
||||
.extensions = "cdg"
|
||||
.extensions = "cdg",
|
||||
};
|
||||
|
@ -484,6 +484,8 @@ AVOutputFormat ff_flv_muxer = {
|
||||
.write_header = flv_write_header,
|
||||
.write_packet = flv_write_packet,
|
||||
.write_trailer = flv_write_trailer,
|
||||
.codec_tag= (const AVCodecTag* const []){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 | AVFMT_VARIABLE_FPS,
|
||||
};
|
||||
|
@ -1306,7 +1306,9 @@ AVOutputFormat ff_matroska_muxer = {
|
||||
.write_packet = mkv_write_packet,
|
||||
.write_trailer = mkv_write_trailer,
|
||||
.flags = AVFMT_GLOBALHEADER | AVFMT_VARIABLE_FPS,
|
||||
.codec_tag = (const AVCodecTag* const []){ff_codec_bmp_tags, ff_codec_wav_tags, 0},
|
||||
.codec_tag = (const AVCodecTag* const []){
|
||||
ff_codec_bmp_tags, ff_codec_wav_tags, 0
|
||||
},
|
||||
.subtitle_codec = CODEC_ID_SSA,
|
||||
.query_codec = mkv_query_codec,
|
||||
};
|
||||
|
@ -3280,7 +3280,9 @@ AVOutputFormat ff_mov_muxer = {
|
||||
.write_packet = ff_mov_write_packet,
|
||||
.write_trailer = mov_write_trailer,
|
||||
.flags = AVFMT_GLOBALHEADER | AVFMT_ALLOW_FLUSH,
|
||||
.codec_tag = (const AVCodecTag* const []){ff_codec_movvideo_tags, ff_codec_movaudio_tags, 0},
|
||||
.codec_tag = (const AVCodecTag* const []){
|
||||
ff_codec_movvideo_tags, ff_codec_movaudio_tags, 0
|
||||
},
|
||||
.priv_class = &mov_muxer_class,
|
||||
};
|
||||
#endif
|
||||
|
@ -130,5 +130,5 @@ AVInputFormat ff_mvi_demuxer = {
|
||||
.priv_data_size = sizeof(MviDemuxContext),
|
||||
.read_header = read_header,
|
||||
.read_packet = read_packet,
|
||||
.extensions = "mvi"
|
||||
.extensions = "mvi",
|
||||
};
|
||||
|
@ -246,5 +246,5 @@ AVInputFormat ff_mxg_demuxer = {
|
||||
.read_header = mxg_read_header,
|
||||
.read_packet = mxg_read_packet,
|
||||
.read_close = mxg_close,
|
||||
.extensions = "mxg"
|
||||
.extensions = "mxg",
|
||||
};
|
||||
|
@ -932,6 +932,9 @@ AVInputFormat ff_nut_demuxer = {
|
||||
.read_close = nut_read_close,
|
||||
.read_seek = read_seek,
|
||||
.extensions = "nut",
|
||||
.codec_tag = (const AVCodecTag * const []) { ff_codec_bmp_tags, ff_nut_video_tags, ff_codec_wav_tags, ff_nut_subtitle_tags, 0 },
|
||||
.codec_tag = (const AVCodecTag * const []) {
|
||||
ff_codec_bmp_tags, ff_nut_video_tags, ff_codec_wav_tags,
|
||||
ff_nut_subtitle_tags, 0
|
||||
},
|
||||
};
|
||||
#endif
|
||||
|
@ -878,5 +878,8 @@ AVOutputFormat ff_nut_muxer = {
|
||||
.write_packet = nut_write_packet,
|
||||
.write_trailer = nut_write_trailer,
|
||||
.flags = AVFMT_GLOBALHEADER | AVFMT_VARIABLE_FPS,
|
||||
.codec_tag = (const AVCodecTag * const []){ ff_codec_bmp_tags, ff_nut_video_tags, ff_codec_wav_tags, ff_nut_subtitle_tags, 0 },
|
||||
.codec_tag = (const AVCodecTag * const []){
|
||||
ff_codec_bmp_tags, ff_nut_video_tags, ff_codec_wav_tags,
|
||||
ff_nut_subtitle_tags, 0
|
||||
},
|
||||
};
|
||||
|
@ -208,5 +208,5 @@ AVInputFormat ff_pva_demuxer = {
|
||||
.read_probe = pva_probe,
|
||||
.read_header = pva_read_header,
|
||||
.read_packet = pva_read_packet,
|
||||
.read_timestamp = pva_read_timestamp
|
||||
.read_timestamp = pva_read_timestamp,
|
||||
};
|
||||
|
@ -237,5 +237,5 @@ AVInputFormat ff_siff_demuxer = {
|
||||
.read_probe = siff_probe,
|
||||
.read_header = siff_read_header,
|
||||
.read_packet = siff_read_packet,
|
||||
.extensions = "vb,son"
|
||||
.extensions = "vb,son",
|
||||
};
|
||||
|
@ -419,6 +419,6 @@ AVInputFormat ff_yuv4mpegpipe_demuxer = {
|
||||
.read_probe = yuv4_probe,
|
||||
.read_header = yuv4_read_header,
|
||||
.read_packet = yuv4_read_packet,
|
||||
.extensions = "y4m"
|
||||
.extensions = "y4m",
|
||||
};
|
||||
#endif
|
||||
|
Loading…
Reference in New Issue
Block a user