diff options
| author | Anton Khirnov <anton@khirnov.net> | 2011-07-16 22:18:12 +0200 |
|---|---|---|
| committer | Anton Khirnov <anton@khirnov.net> | 2011-07-17 06:58:37 +0200 |
| commit | dfc2c4d900e48fa788ad9364ac408c01cfb62b94 (patch) | |
| tree | eafdab4d3a81a427ddf30862f88af6a650eeaef0 /libavformat/mmf.c | |
| parent | 62709956677d648cbf340dccd4549fa62142cb7e (diff) | |
lavf: use designated initialisers for all (de)muxers.
It's more readable and less prone to breakage.
Diffstat (limited to 'libavformat/mmf.c')
| -rw-r--r-- | libavformat/mmf.c | 35 |
1 files changed, 17 insertions, 18 deletions
diff --git a/libavformat/mmf.c b/libavformat/mmf.c index 3848d5cf56..ffa6916d97 100644 --- a/libavformat/mmf.c +++ b/libavformat/mmf.c @@ -291,27 +291,26 @@ static int mmf_read_packet(AVFormatContext *s, #if CONFIG_MMF_DEMUXER AVInputFormat ff_mmf_demuxer = { - "mmf", - NULL_IF_CONFIG_SMALL("Yamaha SMAF"), - sizeof(MMFContext), - mmf_probe, - mmf_read_header, - mmf_read_packet, - NULL, - pcm_read_seek, + .name = "mmf", + .long_name = NULL_IF_CONFIG_SMALL("Yamaha SMAF"), + .priv_data_size = sizeof(MMFContext), + .read_probe = mmf_probe, + .read_header = mmf_read_header, + .read_packet = mmf_read_packet, + .read_seek = pcm_read_seek, }; #endif #if CONFIG_MMF_MUXER AVOutputFormat ff_mmf_muxer = { - "mmf", - NULL_IF_CONFIG_SMALL("Yamaha SMAF"), - "application/vnd.smaf", - "mmf", - sizeof(MMFContext), - CODEC_ID_ADPCM_YAMAHA, - CODEC_ID_NONE, - mmf_write_header, - mmf_write_packet, - mmf_write_trailer, + .name = "mmf", + .long_name = NULL_IF_CONFIG_SMALL("Yamaha SMAF"), + .mime_type = "application/vnd.smaf", + .extensions = "mmf", + .priv_data_size = sizeof(MMFContext), + .audio_codec = CODEC_ID_ADPCM_YAMAHA, + .video_codec = CODEC_ID_NONE, + .write_header = mmf_write_header, + .write_packet = mmf_write_packet, + .write_trailer = mmf_write_trailer, }; #endif |