[FFmpeg-cvslog] Convert all AVClass struct declarations to designated initializers.
Diego Biurrun
git at videolan.org
Thu Nov 2 01:07:21 EET 2017
ffmpeg | branch: master | Diego Biurrun <diego at biurrun.de> | Sat Jun 10 16:45:06 2017 +0200| [97cfe1d8bd1968143e2ba9aa46ebe9504a835e24] | committer: Diego Biurrun
Convert all AVClass struct declarations to designated initializers.
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=97cfe1d8bd1968143e2ba9aa46ebe9504a835e24
---
libavcodec/aacenc.c | 8 ++++----
libavcodec/ac3enc_fixed.c | 9 +++++++--
libavcodec/ac3enc_float.c | 9 +++++++--
libavcodec/dnxhdenc.c | 8 ++++----
libavcodec/eac3enc.c | 9 +++++++--
libavcodec/flacenc.c | 8 ++++----
libavcodec/libfdk-aacdec.c | 5 ++++-
libavcodec/libfdk-aacenc.c | 5 ++++-
libavcodec/libilbc.c | 10 ++++++++--
libavcodec/libopencore-amr.c | 5 ++++-
libavcodec/libopenh264enc.c | 5 ++++-
libavcodec/libvo-amrwbenc.c | 5 ++++-
libavcodec/libvorbis.c | 7 ++++++-
libavfilter/vf_drawtext.c | 6 +++---
libavfilter/vsrc_movie.c | 6 +++---
libavutil/eval.c | 9 ++++++++-
libavutil/file.c | 8 ++++++--
libavutil/imgutils.c | 9 ++++++++-
libavutil/tests/opt.c | 6 +++---
19 files changed, 98 insertions(+), 39 deletions(-)
diff --git a/libavcodec/aacenc.c b/libavcodec/aacenc.c
index 9b0e99b28d..b7f60fb872 100644
--- a/libavcodec/aacenc.c
+++ b/libavcodec/aacenc.c
@@ -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 = {
diff --git a/libavcodec/ac3enc_fixed.c b/libavcodec/ac3enc_fixed.c
index cb1c58d578..a4ab5dfde2 100644
--- a/libavcodec/ac3enc_fixed.c
+++ b/libavcodec/ac3enc_fixed.c
@@ -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.
diff --git a/libavcodec/ac3enc_float.c b/libavcodec/ac3enc_float.c
index 249f9edd11..95acea7770 100644
--- a/libavcodec/ac3enc_float.c
+++ b/libavcodec/ac3enc_float.c
@@ -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,
+};
/*
diff --git a/libavcodec/dnxhdenc.c b/libavcodec/dnxhdenc.c
index 9d4b05292a..639debfa06 100644
--- a/libavcodec/dnxhdenc.c
+++ b/libavcodec/dnxhdenc.c
@@ -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,
diff --git a/libavcodec/eac3enc.c b/libavcodec/eac3enc.c
index 3aa2d54013..17757bebef 100644
--- a/libavcodec/eac3enc.c
+++ b/libavcodec/eac3enc.c
@@ -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,
+};
/**
diff --git a/libavcodec/flacenc.c b/libavcodec/flacenc.c
index 0c1e6b7673..2745b17a1c 100644
--- a/libavcodec/flacenc.c
+++ b/libavcodec/flacenc.c
@@ -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 = {
diff --git a/libavcodec/libfdk-aacdec.c b/libavcodec/libfdk-aacdec.c
index cdf7a0571f..637d1352a0 100644
--- a/libavcodec/libfdk-aacdec.c
+++ b/libavcodec/libfdk-aacdec.c
@@ -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)
diff --git a/libavcodec/libfdk-aacenc.c b/libavcodec/libfdk-aacenc.c
index 2cea58f152..03879bbf5a 100644
--- a/libavcodec/libfdk-aacenc.c
+++ b/libavcodec/libfdk-aacenc.c
@@ -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)
diff --git a/libavcodec/libilbc.c b/libavcodec/libilbc.c
index a5b2f3a18b..80b69a562c 100644
--- a/libavcodec/libilbc.c
+++ b/libavcodec/libilbc.c
@@ -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)
diff --git a/libavcodec/libopencore-amr.c b/libavcodec/libopencore-amr.c
index 27ab7d202f..8200f6719c 100644
--- a/libavcodec/libopencore-amr.c
+++ b/libavcodec/libopencore-amr.c
@@ -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)
diff --git a/libavcodec/libopenh264enc.c b/libavcodec/libopenh264enc.c
index b7c011893e..3b32790bae 100644
--- a/libavcodec/libopenh264enc.c
+++ b/libavcodec/libopenh264enc.c
@@ -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)
diff --git a/libavcodec/libvo-amrwbenc.c b/libavcodec/libvo-amrwbenc.c
index 5fc904cd8f..5439d66110 100644
--- a/libavcodec/libvo-amrwbenc.c
+++ b/libavcodec/libvo-amrwbenc.c
@@ -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)
diff --git a/libavcodec/libvorbis.c b/libavcodec/libvorbis.c
index 86c1ed6a75..3dfd589476 100644
--- a/libavcodec/libvorbis.c
+++ b/libavcodec/libvorbis.c
@@ -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)
diff --git a/libavfilter/vf_drawtext.c b/libavfilter/vf_drawtext.c
index 5668c8e8e0..a5e3f911b4 100644
--- a/libavfilter/vf_drawtext.c
+++ b/libavfilter/vf_drawtext.c
@@ -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__
diff --git a/libavfilter/vsrc_movie.c b/libavfilter/vsrc_movie.c
index 7fc9925848..aff6e620ff 100644
--- a/libavfilter/vsrc_movie.c
+++ b/libavfilter/vsrc_movie.c
@@ -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)
diff --git a/libavutil/eval.c b/libavutil/eval.c
index b5d71c6000..7d7c16e927 100644
--- a/libavutil/eval.c
+++ b/libavutil/eval.c
@@ -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,
diff --git a/libavutil/file.c b/libavutil/file.c
index 18a110aeeb..05ed2479a2 100644
--- a/libavutil/file.c
+++ b/libavutil/file.c
@@ -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,
diff --git a/libavutil/imgutils.c b/libavutil/imgutils.c
index 20d06ec175..84abb11656 100644
--- a/libavutil/imgutils.c
+++ b/libavutil/imgutils.c
@@ -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)
{
diff --git a/libavutil/tests/opt.c b/libavutil/tests/opt.c
index 350ce3d820..9ed9d2b6b1 100644
--- a/libavutil/tests/opt.c
+++ b/libavutil/tests/opt.c
@@ -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)
More information about the ffmpeg-cvslog
mailing list