From dfc2c4d900e48fa788ad9364ac408c01cfb62b94 Mon Sep 17 00:00:00 2001 From: Anton Khirnov Date: Sat, 16 Jul 2011 22:18:12 +0200 Subject: lavf: use designated initialisers for all (de)muxers. It's more readable and less prone to breakage. --- libavformat/mxfenc.c | 49 +++++++++++++++++++++++-------------------------- 1 file changed, 23 insertions(+), 26 deletions(-) (limited to 'libavformat/mxfenc.c') diff --git a/libavformat/mxfenc.c b/libavformat/mxfenc.c index 7dadec080f..d375e3fe0e 100644 --- a/libavformat/mxfenc.c +++ b/libavformat/mxfenc.c @@ -1890,33 +1890,30 @@ static int mxf_interleave(AVFormatContext *s, AVPacket *out, AVPacket *pkt, int } AVOutputFormat ff_mxf_muxer = { - "mxf", - NULL_IF_CONFIG_SMALL("Material eXchange Format"), - "application/mxf", - "mxf", - sizeof(MXFContext), - CODEC_ID_PCM_S16LE, - CODEC_ID_MPEG2VIDEO, - mxf_write_header, - mxf_write_packet, - mxf_write_footer, - AVFMT_NOTIMESTAMPS, - NULL, - mxf_interleave, + .name = "mxf", + .long_name = NULL_IF_CONFIG_SMALL("Material eXchange Format"), + .mime_type = "application/mxf", + .extensions = "mxf", + .priv_data_size = sizeof(MXFContext), + .audio_codec = CODEC_ID_PCM_S16LE, + .video_codec = CODEC_ID_MPEG2VIDEO, + .write_header = mxf_write_header, + .write_packet = mxf_write_packet, + .write_trailer = mxf_write_footer, + .flags = AVFMT_NOTIMESTAMPS, + .interleave_packet = mxf_interleave, }; AVOutputFormat ff_mxf_d10_muxer = { - "mxf_d10", - NULL_IF_CONFIG_SMALL("Material eXchange Format, D-10 Mapping"), - "application/mxf", - NULL, - sizeof(MXFContext), - CODEC_ID_PCM_S16LE, - CODEC_ID_MPEG2VIDEO, - mxf_write_header, - mxf_write_packet, - mxf_write_footer, - AVFMT_NOTIMESTAMPS, - NULL, - mxf_interleave, + .name = "mxf_d10", + .long_name = NULL_IF_CONFIG_SMALL("Material eXchange Format, D-10 Mapping"), + .mime_type = "application/mxf", + .priv_data_size = sizeof(MXFContext), + .audio_codec = CODEC_ID_PCM_S16LE, + .video_codec = CODEC_ID_MPEG2VIDEO, + .write_header = mxf_write_header, + .write_packet = mxf_write_packet, + .write_trailer = mxf_write_footer, + .flags = AVFMT_NOTIMESTAMPS, + .interleave_packet = mxf_interleave, }; -- cgit v1.2.3