From ba10207bbe5ebd97b5afc3f19baf4a1ad8f974d5 Mon Sep 17 00:00:00 2001 From: Paul B Mahol Date: Fri, 30 Dec 2011 20:00:53 +0100 Subject: Use more designated initializers. Also remove some pointless NULL/0 assigments. C++ code must be left as it is because named struct initializers are not supported by C++ standard. --- libavformat/cafenc.c | 20 ++++++++++---------- libavformat/crcenc.c | 1 - libavformat/ffmenc.c | 1 - libavformat/framecrcenc.c | 1 - libavformat/g723_1.c | 10 ++++------ libavformat/md5enc.c | 2 -- libavformat/mkvtimestamp_v2.c | 15 ++++++--------- libavformat/vc1testenc.c | 1 - libavformat/yuv4mpeg.c | 1 - 9 files changed, 20 insertions(+), 32 deletions(-) (limited to 'libavformat') diff --git a/libavformat/cafenc.c b/libavformat/cafenc.c index 0dd4b349ca..699c67df7a 100644 --- a/libavformat/cafenc.c +++ b/libavformat/cafenc.c @@ -248,15 +248,15 @@ static int caf_write_trailer(AVFormatContext *s) } AVOutputFormat ff_caf_muxer = { - "caf", - NULL_IF_CONFIG_SMALL("Apple Core Audio Format"), - "audio/x-caf", - "caf", - sizeof(CAFContext), - CODEC_ID_PCM_S16BE, - CODEC_ID_NONE, - caf_write_header, - caf_write_packet, - caf_write_trailer, + .name = "caf", + .long_name = NULL_IF_CONFIG_SMALL("Apple Core Audio Format"), + .mime_type = "audio/x-caf", + .extensions = "caf", + .priv_data_size = sizeof(CAFContext), + .audio_codec = CODEC_ID_PCM_S16BE, + .video_codec = CODEC_ID_NONE, + .write_header = caf_write_header, + .write_packet = caf_write_packet, + .write_trailer = caf_write_trailer, .codec_tag= (const AVCodecTag* const []){ff_codec_caf_tags, 0}, }; diff --git a/libavformat/crcenc.c b/libavformat/crcenc.c index d0ca8352d9..1f5854e080 100644 --- a/libavformat/crcenc.c +++ b/libavformat/crcenc.c @@ -57,7 +57,6 @@ static int crc_write_trailer(struct AVFormatContext *s) AVOutputFormat ff_crc_muxer = { .name = "crc", .long_name = NULL_IF_CONFIG_SMALL("CRC testing format"), - .extensions = "", .priv_data_size = sizeof(CRCState), .audio_codec = CODEC_ID_PCM_S16LE, .video_codec = CODEC_ID_RAWVIDEO, diff --git a/libavformat/ffmenc.c b/libavformat/ffmenc.c index 7378808567..cd4ee61326 100644 --- a/libavformat/ffmenc.c +++ b/libavformat/ffmenc.c @@ -244,7 +244,6 @@ static int ffm_write_trailer(AVFormatContext *s) AVOutputFormat ff_ffm_muxer = { .name = "ffm", .long_name = NULL_IF_CONFIG_SMALL("FFM (FFserver live feed) format"), - .mime_type = "", .extensions = "ffm", .priv_data_size = sizeof(FFMContext), .audio_codec = CODEC_ID_MP2, diff --git a/libavformat/framecrcenc.c b/libavformat/framecrcenc.c index 5798560cbe..8e66a8daf3 100644 --- a/libavformat/framecrcenc.c +++ b/libavformat/framecrcenc.c @@ -36,7 +36,6 @@ static int framecrc_write_packet(struct AVFormatContext *s, AVPacket *pkt) AVOutputFormat ff_framecrc_muxer = { .name = "framecrc", .long_name = NULL_IF_CONFIG_SMALL("framecrc testing format"), - .extensions = "", .audio_codec = CODEC_ID_PCM_S16LE, .video_codec = CODEC_ID_RAWVIDEO, .write_packet = framecrc_write_packet, diff --git a/libavformat/g723_1.c b/libavformat/g723_1.c index 86ef540edf..00cfe16266 100644 --- a/libavformat/g723_1.c +++ b/libavformat/g723_1.c @@ -73,12 +73,10 @@ static int g723_1_read_packet(AVFormatContext *s, AVPacket *pkt) } AVInputFormat ff_g723_1_demuxer = { - "g723_1", - NULL_IF_CONFIG_SMALL("G.723.1 format"), - 0, - NULL, - g723_1_init, - g723_1_read_packet, + .name = "g723_1", + .long_name = NULL_IF_CONFIG_SMALL("G.723.1 format"), + .read_header = g723_1_init, + .read_packet = g723_1_read_packet, .extensions = "tco,rco", .flags = AVFMT_GENERIC_INDEX }; diff --git a/libavformat/md5enc.c b/libavformat/md5enc.c index c18d6e4cbd..052061f039 100644 --- a/libavformat/md5enc.c +++ b/libavformat/md5enc.c @@ -68,7 +68,6 @@ static int write_trailer(struct AVFormatContext *s) AVOutputFormat ff_md5_muxer = { .name = "md5", .long_name = NULL_IF_CONFIG_SMALL("MD5 testing format"), - .extensions = "", .priv_data_size = PRIVSIZE, .audio_codec = CODEC_ID_PCM_S16LE, .video_codec = CODEC_ID_RAWVIDEO, @@ -98,7 +97,6 @@ static int framemd5_write_packet(struct AVFormatContext *s, AVPacket *pkt) AVOutputFormat ff_framemd5_muxer = { .name = "framemd5", .long_name = NULL_IF_CONFIG_SMALL("Per-frame MD5 testing format"), - .extensions = "", .priv_data_size = PRIVSIZE, .audio_codec = CODEC_ID_PCM_S16LE, .video_codec = CODEC_ID_RAWVIDEO, diff --git a/libavformat/mkvtimestamp_v2.c b/libavformat/mkvtimestamp_v2.c index f120460057..469b75db41 100644 --- a/libavformat/mkvtimestamp_v2.c +++ b/libavformat/mkvtimestamp_v2.c @@ -42,13 +42,10 @@ static int write_packet(AVFormatContext *s, AVPacket *pkt) } AVOutputFormat ff_mkvtimestamp_v2_muxer = { - "mkvtimestamp_v2", - NULL_IF_CONFIG_SMALL("extract pts as timecode v2 format, as defined by mkvtoolnix"), - NULL, - "", - 0, - CODEC_ID_NONE, - CODEC_ID_RAWVIDEO, - write_header, - write_packet, + .name = "mkvtimestamp_v2", + .long_name = NULL_IF_CONFIG_SMALL("extract pts as timecode v2 format, as defined by mkvtoolnix"), + .audio_codec = CODEC_ID_NONE, + .video_codec = CODEC_ID_RAWVIDEO, + .write_header = write_header, + .write_packet = write_packet, }; diff --git a/libavformat/vc1testenc.c b/libavformat/vc1testenc.c index b1ed43d62e..10b7b64819 100644 --- a/libavformat/vc1testenc.c +++ b/libavformat/vc1testenc.c @@ -85,7 +85,6 @@ static int vc1test_write_trailer(AVFormatContext *s) AVOutputFormat ff_vc1t_muxer = { .name = "rcv", .long_name = NULL_IF_CONFIG_SMALL("VC-1 test bitstream"), - .mime_type = "", .extensions = "rcv", .priv_data_size = sizeof(RCVContext), .audio_codec = CODEC_ID_NONE, diff --git a/libavformat/yuv4mpeg.c b/libavformat/yuv4mpeg.c index dad29d8d55..61c72f5d82 100644 --- a/libavformat/yuv4mpeg.c +++ b/libavformat/yuv4mpeg.c @@ -181,7 +181,6 @@ static int yuv4_write_header(AVFormatContext *s) AVOutputFormat ff_yuv4mpegpipe_muxer = { .name = "yuv4mpegpipe", .long_name = NULL_IF_CONFIG_SMALL("YUV4MPEG pipe format"), - .mime_type = "", .extensions = "y4m", .priv_data_size = sizeof(int), .audio_codec = CODEC_ID_NONE, -- cgit v1.2.3