diff options
author | Anton Khirnov <anton@khirnov.net> | 2011-04-29 13:30:02 +0400 |
---|---|---|
committer | Anton Khirnov <anton@khirnov.net> | 2011-05-18 01:01:42 +0400 |
commit | f0029cbcf68d77f4ea0ea0cc36596ea2a5305b13 (patch) | |
tree | 639e57fc963fe245eca07ec29843bdfc839a2ada | |
parent | 13220b1856c98d83ad8ac237e789927cce0b9413 (diff) |
lavf: use designated initializers for AVClasses.
-rw-r--r-- | libavformat/avio.c | 8 | ||||
-rw-r--r-- | libavformat/crypto.c | 5 | ||||
-rw-r--r-- | libavformat/http.c | 5 | ||||
-rw-r--r-- | libavformat/mp3enc.c | 8 | ||||
-rw-r--r-- | libavformat/mpegtsenc.c | 8 | ||||
-rw-r--r-- | libavformat/options.c | 7 | ||||
-rw-r--r-- | libavformat/spdifenc.c | 7 |
7 files changed, 34 insertions, 14 deletions
diff --git a/libavformat/avio.c b/libavformat/avio.c index 8881f269f2..ac15407fda 100644 --- a/libavformat/avio.c +++ b/libavformat/avio.c @@ -39,8 +39,12 @@ static const char *urlcontext_to_name(void *ptr) else return "NULL"; } static const AVOption options[] = {{NULL}}; -static const AVClass urlcontext_class = - { "URLContext", urlcontext_to_name, options, LIBAVUTIL_VERSION_INT }; +static const AVClass urlcontext_class = { + .class_name = "URLContext", + .item_name = urlcontext_to_name, + .option = options, + .version = LIBAVUTIL_VERSION_INT, +}; /*@}*/ static int default_interrupt_cb(void); diff --git a/libavformat/crypto.c b/libavformat/crypto.c index fecc2c961c..789a4d1e76 100644 --- a/libavformat/crypto.c +++ b/libavformat/crypto.c @@ -52,7 +52,10 @@ static const AVOption options[] = { }; static const AVClass crypto_class = { - "crypto", av_default_item_name, options, LIBAVUTIL_VERSION_INT + .class_name = "crypto", + .item_name = av_default_item_name, + .option = options, + .version = LIBAVUTIL_VERSION_INT, }; static int crypto_open(URLContext *h, const char *uri, int flags) diff --git a/libavformat/http.c b/libavformat/http.c index ff8f2405eb..aa8c6657db 100644 --- a/libavformat/http.c +++ b/libavformat/http.c @@ -58,7 +58,10 @@ static const AVOption options[] = { {NULL} }; static const AVClass httpcontext_class = { - "HTTP", av_default_item_name, options, LIBAVUTIL_VERSION_INT + .class_name = "HTTP", + .item_name = av_default_item_name, + .option = options, + .version = LIBAVUTIL_VERSION_INT, }; static int http_connect(URLContext *h, const char *path, const char *hoststr, diff --git a/libavformat/mp3enc.c b/libavformat/mp3enc.c index 2337837ef1..00ed6f8d4c 100644 --- a/libavformat/mp3enc.c +++ b/libavformat/mp3enc.c @@ -167,10 +167,10 @@ static const AVOption options[] = { }; static const AVClass mp3_muxer_class = { - "MP3 muxer", - av_default_item_name, - options, - LIBAVUTIL_VERSION_INT, + .class_name = "MP3 muxer", + .item_name = av_default_item_name, + .option = options, + .version = LIBAVUTIL_VERSION_INT, }; static int id3v2_check_write_tag(AVFormatContext *s, AVMetadataTag *t, const char table[][4], diff --git a/libavformat/mpegtsenc.c b/libavformat/mpegtsenc.c index 8fa8a56c90..2aa9698651 100644 --- a/libavformat/mpegtsenc.c +++ b/libavformat/mpegtsenc.c @@ -89,10 +89,10 @@ static const AVOption options[] = { }; static const AVClass mpegts_muxer_class = { - "MPEGTS muxer", - av_default_item_name, - options, - LIBAVUTIL_VERSION_INT, + .class_name = "MPEGTS muxer", + .item_name = av_default_item_name, + .option = options, + .version = LIBAVUTIL_VERSION_INT, }; /* NOTE: 4 bytes must be left at the end for the crc32 */ diff --git a/libavformat/options.c b/libavformat/options.c index bdf4796e49..483b644f8d 100644 --- a/libavformat/options.c +++ b/libavformat/options.c @@ -64,7 +64,12 @@ static const AVOption options[]={ #undef D #undef DEFAULT -static const AVClass av_format_context_class = { "AVFormatContext", format_to_name, options, LIBAVUTIL_VERSION_INT }; +static const AVClass av_format_context_class = { + .class_name = "AVFormatContext", + .item_name = format_to_name, + .option = options, + .version = LIBAVUTIL_VERSION_INT, +}; static void avformat_get_context_defaults(AVFormatContext *s) { diff --git a/libavformat/spdifenc.c b/libavformat/spdifenc.c index 24c2f15754..735546096f 100644 --- a/libavformat/spdifenc.c +++ b/libavformat/spdifenc.c @@ -93,7 +93,12 @@ static const AVOption options[] = { { NULL }, }; -static const AVClass class = { "spdif", av_default_item_name, options, LIBAVUTIL_VERSION_INT }; +static const AVClass class = { + .class_name = "spdif", + .item_name = av_default_item_name, + .option = options, + .version = LIBAVUTIL_VERSION_INT, +}; static int spdif_header_ac3(AVFormatContext *s, AVPacket *pkt) { |