videolan
/
ffmpeg
mirror of https://git.videolan.org/git/ffmpeg.git
1
Fork 0
Code Releases Activity

Convert all AVClass struct declarations to designated initializers.

This commit is contained in:
Diego Biurrun 2017-06-10 16:45:06 +02:00
parent 98ea98069b
commit 97cfe1d8bd
19 changed files with 98 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libavcodec/aacenc.c
View File

@ -803,10 +803,10 @@ static const AVOption aacenc_options[] = {
};
static const AVClass aacenc_class = {
"AAC encoder",
av_default_item_name,
aacenc_options,
LIBAVUTIL_VERSION_INT,
.class_name = "AAC encoder",
.item_name = av_default_item_name,
.option = aacenc_options,
.version = LIBAVUTIL_VERSION_INT,
};
AVCodec ff_aac_encoder = {

9
libavcodec/ac3enc_fixed.c
View File

@ -35,8 +35,13 @@
#define AC3ENC_TYPE AC3ENC_TYPE_AC3_FIXED
#include "ac3enc_opts_template.c"
static const AVClass ac3enc_class = { "Fixed-Point AC-3 Encoder", av_default_item_name,
ac3_options, LIBAVUTIL_VERSION_INT };
static const AVClass ac3enc_class = {
.class_name = "Fixed-Point AC-3 Encoder",
.item_name = av_default_item_name,
.option = ac3_options,
.version = LIBAVUTIL_VERSION_INT,
};
/*
* Normalize the input samples to use the maximum available precision.

9
libavcodec/ac3enc_float.c
View File

@ -36,8 +36,13 @@
#define AC3ENC_TYPE AC3ENC_TYPE_AC3
#include "ac3enc_opts_template.c"
static const AVClass ac3enc_class = { "AC-3 Encoder", av_default_item_name,
ac3_options, LIBAVUTIL_VERSION_INT };
static const AVClass ac3enc_class = {
.class_name = "AC-3 Encoder",
.item_name = av_default_item_name,
.option = ac3_options,
.version = LIBAVUTIL_VERSION_INT,
};
/*

8
libavcodec/dnxhdenc.c
View File

@ -52,10 +52,10 @@ static const AVOption options[] = {
};
static const AVClass class = {
"dnxhd",
av_default_item_name,
options,
LIBAVUTIL_VERSION_INT
.class_name = "dnxhd",
.item_name = av_default_item_name,
.option = options,
.version = LIBAVUTIL_VERSION_INT,
};
static void dnxhd_8bit_get_pixels_8x4_sym(int16_t *restrict block,

9
libavcodec/eac3enc.c
View File

@ -34,8 +34,13 @@
#define AC3ENC_TYPE AC3ENC_TYPE_EAC3
#include "ac3enc_opts_template.c"
static const AVClass eac3enc_class = { "E-AC-3 Encoder", av_default_item_name,
ac3_options, LIBAVUTIL_VERSION_INT };
static const AVClass eac3enc_class = {
.class_name = "E-AC-3 Encoder",
.item_name = av_default_item_name,
.option = ac3_options,
.version = LIBAVUTIL_VERSION_INT,
};
/**

8
libavcodec/flacenc.c
View File

@ -1359,10 +1359,10 @@ static const AVOption options[] = {
};
static const AVClass flac_encoder_class = {
"FLAC encoder",
av_default_item_name,
options,
LIBAVUTIL_VERSION_INT,
.class_name = "FLAC encoder",
.item_name = av_default_item_name,
.option = options,
.version = LIBAVUTIL_VERSION_INT,
};
AVCodec ff_flac_encoder = {

5
libavcodec/libfdk-aacdec.c
View File

@ -79,7 +79,10 @@ static const AVOption fdk_aac_dec_options[] = {
};
static const AVClass fdk_aac_dec_class = {
"libfdk-aac decoder", av_default_item_name, fdk_aac_dec_options, LIBAVUTIL_VERSION_INT
.class_name = "libfdk-aac decoder",
.item_name = av_default_item_name,
.option = fdk_aac_dec_options,
.version = LIBAVUTIL_VERSION_INT
};
static int get_stream_info(AVCodecContext *avctx)

5
libavcodec/libfdk-aacenc.c
View File

@ -54,7 +54,10 @@ static const AVOption aac_enc_options[] = {
};
static const AVClass aac_enc_class = {
"libfdk_aac", av_default_item_name, aac_enc_options, LIBAVUTIL_VERSION_INT
.class_name = "libfdk_aac",
.item_name = av_default_item_name,
.option = aac_enc_options,
.version = LIBAVUTIL_VERSION_INT,
};
static const char *aac_get_error(AACENC_ERROR err)

10
libavcodec/libilbc.c
View File

@ -51,7 +51,10 @@ static const AVOption ilbc_dec_options[] = {
};
static const AVClass ilbc_dec_class = {
"libilbc", av_default_item_name, ilbc_dec_options, LIBAVUTIL_VERSION_INT
.class_name = "libilbc",
.item_name = av_default_item_name,
.option = ilbc_dec_options,
.version = LIBAVUTIL_VERSION_INT,
};
static av_cold int ilbc_decode_init(AVCodecContext *avctx)
@ -126,7 +129,10 @@ static const AVOption ilbc_enc_options[] = {
};
static const AVClass ilbc_enc_class = {
"libilbc", av_default_item_name, ilbc_enc_options, LIBAVUTIL_VERSION_INT
.class_name = "libilbc",
.item_name = av_default_item_name,
.option = ilbc_enc_options,
.version = LIBAVUTIL_VERSION_INT,
};
static av_cold int ilbc_encode_init(AVCodecContext *avctx)

5
libavcodec/libopencore-amr.c
View File

@ -184,7 +184,10 @@ static const AVOption options[] = {
};
static const AVClass class = {
"libopencore_amrnb", av_default_item_name, options, LIBAVUTIL_VERSION_INT
.class_name = "libopencore_amrnb",
.item_name = av_default_item_name,
.option = options,
.version = LIBAVUTIL_VERSION_INT,
};
static av_cold int amr_nb_encode_init(AVCodecContext *avctx)

5
libavcodec/libopenh264enc.c
View File

@ -75,7 +75,10 @@ static const AVOption options[] = {
};
static const AVClass class = {
"libopenh264enc", av_default_item_name, options, LIBAVUTIL_VERSION_INT
.class_name = "libopenh264enc",
.item_name = av_default_item_name,
.option = options,
.version = LIBAVUTIL_VERSION_INT,
};
static av_cold int svc_encode_close(AVCodecContext *avctx)

5
libavcodec/libvo-amrwbenc.c
View File

@ -46,7 +46,10 @@ static const AVOption options[] = {
};
static const AVClass class = {
"libvo_amrwbenc", av_default_item_name, options, LIBAVUTIL_VERSION_INT
.class_name = "libvo_amrwbenc",
.item_name = av_default_item_name,
.option = options,
.version = LIBAVUTIL_VERSION_INT,
};
static int get_wb_bitrate_mode(int bitrate, void *log_ctx)

7
libavcodec/libvorbis.c
View File

@ -72,7 +72,12 @@ static const AVCodecDefault defaults[] = {
{ NULL },
};
static const AVClass class = { "libvorbis", av_default_item_name, options, LIBAVUTIL_VERSION_INT };
static const AVClass class = {
.class_name = "libvorbis",
.item_name = av_default_item_name,
.option = options,
.version = LIBAVUTIL_VERSION_INT,
};
static int vorbis_error_to_averror(int ov_err)

6
libavfilter/vf_drawtext.c
View File

@ -209,9 +209,9 @@ static const char *drawtext_get_name(void *ctx)
}
static const AVClass drawtext_class = {
"DrawTextContext",
drawtext_get_name,
drawtext_options
.class_name = "DrawTextContext",
.item_name = drawtext_get_name,
.option = drawtext_options,
};
#undef __FTERRORS_H__

6
libavfilter/vsrc_movie.c
View File

@ -81,9 +81,9 @@ static const char *movie_get_name(void *ctx)
}
static const AVClass movie_class = {
"MovieContext",
movie_get_name,
movie_options
.class_name = "MovieContext",
.item_name = movie_get_name,
.option = movie_options,
};
static av_cold int movie_init(AVFilterContext *ctx)

9
libavutil/eval.c
View File

@ -52,7 +52,14 @@ typedef struct Parser {
double var[VARS];
} Parser;
static const AVClass class = { "Eval", av_default_item_name, NULL, LIBAVUTIL_VERSION_INT, offsetof(Parser,log_offset), offsetof(Parser,log_ctx) };
static const AVClass class = {
.class_name = "Eval",
.item_name = av_default_item_name,
.option = NULL,
.version = LIBAVUTIL_VERSION_INT,
.log_level_offset_offset = offsetof(Parser, log_offset),
.parent_log_context_offset = offsetof(Parser, log_ctx),
};
static const int8_t si_prefixes['z' - 'E' + 1] = {
['y'-'E']= -24,

8
libavutil/file.c
View File

@ -42,8 +42,12 @@ typedef struct FileLogContext {
} FileLogContext;
static const AVClass file_log_ctx_class = {
"FILE", av_default_item_name, NULL, LIBAVUTIL_VERSION_INT,
offsetof(FileLogContext, log_offset), offsetof(FileLogContext, log_ctx)
.class_name = "FILE",
.item_name = av_default_item_name,
.option = NULL,
.version = LIBAVUTIL_VERSION_INT,
.log_level_offset_offset = offsetof(FileLogContext, log_offset),
.parent_log_context_offset = offsetof(FileLogContext, log_ctx),
};
int av_file_map(const char *filename, uint8_t **bufptr, size_t *size,

9
libavutil/imgutils.c
View File

@ -219,7 +219,14 @@ typedef struct ImgUtils {
void *log_ctx;
} ImgUtils;
static const AVClass imgutils_class = { "IMGUTILS", av_default_item_name, NULL, LIBAVUTIL_VERSION_INT, offsetof(ImgUtils, log_offset), offsetof(ImgUtils, log_ctx) };
static const AVClass imgutils_class = {
.class_name = "IMGUTILS",
.item_name = av_default_item_name,
.option = NULL,
.version = LIBAVUTIL_VERSION_INT,
.log_level_offset_offset = offsetof(ImgUtils, log_offset),
.parent_log_context_offset = offsetof(ImgUtils, log_ctx),
};
int av_image_check_size(unsigned int w, unsigned int h, int log_offset, void *log_ctx)
{

6
libavutil/tests/opt.c
View File

@ -59,9 +59,9 @@ static const char *test_get_name(void *ctx)
}
static const AVClass test_class = {
"TestContext",
test_get_name,
test_options
.class_name = "TestContext",
.item_name = test_get_name,
.option = test_options,
};
int main(void)