MrBesen/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

lavf: use designated initializers for AVClasses.

Browse Source
This commit is contained in:
Anton Khirnov 2011-04-29 11:30:02 +02:00
parent 5a43bd5e26
commit 4a7a1b7def
7 changed files with 34 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libavformat/avio.c
View File

@ -40,8 +40,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);

5
libavformat/crypto.c
View File

@ -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)

5
libavformat/http.c
View File

@ -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,

8
libavformat/mp3enc.c
View File

@ -166,10 +166,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],

8
libavformat/mpegtsenc.c
View File

@ -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 */

7
libavformat/options.c
View File

@ -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)
{

7
libavformat/spdifenc.c
View File

@ -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)
{