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/swfenc.c | |
| parent | 62709956677d648cbf340dccd4549fa62142cb7e (diff) | |
| download | ffmpeg-dfc2c4d900e48fa788ad9364ac408c01cfb62b94.tar.gz | |
lavf: use designated initialisers for all (de)muxers.
It's more readable and less prone to breakage.
Diffstat (limited to 'libavformat/swfenc.c')
| -rw-r--r-- | libavformat/swfenc.c | 39 |
1 files changed, 19 insertions, 20 deletions
diff --git a/libavformat/swfenc.c b/libavformat/swfenc.c index 4c5c3155ab..f4494cd63a 100644 --- a/libavformat/swfenc.c +++ b/libavformat/swfenc.c @@ -507,29 +507,28 @@ static int swf_write_trailer(AVFormatContext *s) #if CONFIG_SWF_MUXER AVOutputFormat ff_swf_muxer = { - "swf", - NULL_IF_CONFIG_SMALL("Flash format"), - "application/x-shockwave-flash", - "swf", - sizeof(SWFContext), - CODEC_ID_MP3, - CODEC_ID_FLV1, - swf_write_header, - swf_write_packet, - swf_write_trailer, + .name = "swf", + .long_name = NULL_IF_CONFIG_SMALL("Flash format"), + .mime_type = "application/x-shockwave-flash", + .extensions = "swf", + .priv_data_size = sizeof(SWFContext), + .audio_codec = CODEC_ID_MP3, + .video_codec = CODEC_ID_FLV1, + .write_header = swf_write_header, + .write_packet = swf_write_packet, + .write_trailer = swf_write_trailer, }; #endif #if CONFIG_AVM2_MUXER AVOutputFormat ff_avm2_muxer = { - "avm2", - NULL_IF_CONFIG_SMALL("Flash 9 (AVM2) format"), - "application/x-shockwave-flash", - NULL, - sizeof(SWFContext), - CODEC_ID_MP3, - CODEC_ID_FLV1, - swf_write_header, - swf_write_packet, - swf_write_trailer, + .name = "avm2", + .long_name = NULL_IF_CONFIG_SMALL("Flash 9 (AVM2) format"), + .mime_type = "application/x-shockwave-flash", + .priv_data_size = sizeof(SWFContext), + .audio_codec = CODEC_ID_MP3, + .video_codec = CODEC_ID_FLV1, + .write_header = swf_write_header, + .write_packet = swf_write_packet, + .write_trailer = swf_write_trailer, }; #endif |