opensource/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-06 15:49:50 +08:00
Code Issues Packages Projects Releases Wiki Activity

lavf: use designated initialisers for all (de)muxers.

Browse Source 
It's more readable and less prone to breakage.
This commit is contained in:
Anton Khirnov
2011-07-16 22:18:12 +02:00
parent 6270995667
commit dfc2c4d900
132 changed files with 1311 additions and 1466 deletions
Download Patch File Download Diff File Expand all files Collapse all files

60
libavformat/matroskaenc.c
View File

@ -1193,16 +1193,16 @@ static int mkv_write_trailer(AVFormatContext *s)
#if CONFIG_MATROSKA_MUXER
AVOutputFormat ff_matroska_muxer = {
"matroska",
NULL_IF_CONFIG_SMALL("Matroska file format"),
"video/x-matroska",
"mkv",
sizeof(MatroskaMuxContext),
CODEC_ID_MP2,
CODEC_ID_MPEG4,
mkv_write_header,
mkv_write_packet,
mkv_write_trailer,
.name = "matroska",
.long_name = NULL_IF_CONFIG_SMALL("Matroska file format"),
.mime_type = "video/x-matroska",
.extensions = "mkv",
.priv_data_size = sizeof(MatroskaMuxContext),
.audio_codec = CODEC_ID_MP2,
.video_codec = CODEC_ID_MPEG4,
.write_header = mkv_write_header,
.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},
.subtitle_codec = CODEC_ID_SSA,
@ -1211,32 +1211,32 @@ AVOutputFormat ff_matroska_muxer = {
#if CONFIG_WEBM_MUXER
AVOutputFormat ff_webm_muxer = {
"webm",
NULL_IF_CONFIG_SMALL("WebM file format"),
"video/webm",
"webm",
sizeof(MatroskaMuxContext),
CODEC_ID_VORBIS,
CODEC_ID_VP8,
mkv_write_header,
mkv_write_packet,
mkv_write_trailer,
.name = "webm",
.long_name = NULL_IF_CONFIG_SMALL("WebM file format"),
.mime_type = "video/webm",
.extensions = "webm",
.priv_data_size = sizeof(MatroskaMuxContext),
.audio_codec = CODEC_ID_VORBIS,
.video_codec = CODEC_ID_VP8,
.write_header = mkv_write_header,
.write_packet = mkv_write_packet,
.write_trailer = mkv_write_trailer,
.flags = AVFMT_GLOBALHEADER | AVFMT_VARIABLE_FPS,
};
#endif
#if CONFIG_MATROSKA_AUDIO_MUXER
AVOutputFormat ff_matroska_audio_muxer = {
"matroska",
NULL_IF_CONFIG_SMALL("Matroska file format"),
"audio/x-matroska",
"mka",
sizeof(MatroskaMuxContext),
CODEC_ID_MP2,
CODEC_ID_NONE,
mkv_write_header,
mkv_write_packet,
mkv_write_trailer,
.name = "matroska",
.long_name = NULL_IF_CONFIG_SMALL("Matroska file format"),
.mime_type = "audio/x-matroska",
.extensions = "mka",
.priv_data_size = sizeof(MatroskaMuxContext),
.audio_codec = CODEC_ID_MP2,
.video_codec = CODEC_ID_NONE,
.write_header = mkv_write_header,
.write_packet = mkv_write_packet,
.write_trailer = mkv_write_trailer,
.flags = AVFMT_GLOBALHEADER,
.codec_tag = (const AVCodecTag* const []){ff_codec_wav_tags, 0},
};