forked from FFmpeg/FFmpeg
lavfi: use designated initializers for AVClass
While here: - add missing .version and .category, - make .class_name consistent across filters, - align declarations. Signed-off-by: Paul B Mahol <onemda@gmail.com>
This commit is contained in:
parent
d70a1a507d
commit
54101214d8
25 changed files with 98 additions and 53 deletions
|
@ -54,11 +54,11 @@ static const AVOption options[] = {
|
|||
};
|
||||
|
||||
static const AVClass aformat_class = {
|
||||
.class_name = "aformat filter",
|
||||
.class_name = "aformat",
|
||||
.item_name = av_default_item_name,
|
||||
.option = options,
|
||||
.version = LIBAVUTIL_VERSION_INT,
|
||||
.category = AV_CLASS_CATEGORY_FILTER,
|
||||
.category = AV_CLASS_CATEGORY_FILTER,
|
||||
};
|
||||
|
||||
#define PARSE_FORMATS(str, type, list, add_to_list, get_fmt, none, desc) \
|
||||
|
|
|
@ -53,9 +53,11 @@ static const AVOption amerge_options[] = {
|
|||
};
|
||||
|
||||
static const AVClass amerge_class = {
|
||||
.class_name = "AMergeContext",
|
||||
.class_name = "amerge",
|
||||
.item_name = av_default_item_name,
|
||||
.option = amerge_options,
|
||||
.version = LIBAVUTIL_VERSION_INT,
|
||||
.category = AV_CLASS_CATEGORY_FILTER,
|
||||
};
|
||||
|
||||
static av_cold void uninit(AVFilterContext *ctx)
|
||||
|
|
|
@ -185,10 +185,11 @@ static const AVOption options[] = {
|
|||
};
|
||||
|
||||
static const AVClass amix_class = {
|
||||
.class_name = "amix filter",
|
||||
.class_name = "amix",
|
||||
.item_name = av_default_item_name,
|
||||
.option = options,
|
||||
.version = LIBAVUTIL_VERSION_INT,
|
||||
.category = AV_CLASS_CATEGORY_FILTER,
|
||||
};
|
||||
|
||||
|
||||
|
|
|
@ -51,9 +51,11 @@ static const AVOption asns_options[] = {
|
|||
};
|
||||
|
||||
static const AVClass asns_class = {
|
||||
"asetnsamples",
|
||||
av_default_item_name,
|
||||
asns_options
|
||||
.class_name = "asetnsamples",
|
||||
.item_name = av_default_item_name,
|
||||
.option = asns_options,
|
||||
.version = LIBAVUTIL_VERSION_INT,
|
||||
.category = AV_CLASS_CATEGORY_FILTER,
|
||||
};
|
||||
|
||||
static av_cold int init(AVFilterContext *ctx, const char *args, void *opaque)
|
||||
|
|
|
@ -50,10 +50,11 @@ static const AVOption options[] = {
|
|||
};
|
||||
|
||||
static const AVClass async_class = {
|
||||
.class_name = "asyncts filter",
|
||||
.class_name = "asyncts",
|
||||
.item_name = av_default_item_name,
|
||||
.option = options,
|
||||
.version = LIBAVUTIL_VERSION_INT,
|
||||
.category = AV_CLASS_CATEGORY_FILTER,
|
||||
};
|
||||
|
||||
static int init(AVFilterContext *ctx, const char *args, void *opaque)
|
||||
|
|
|
@ -46,10 +46,11 @@ static const AVOption options[] = {
|
|||
};
|
||||
|
||||
static const AVClass channelsplit_class = {
|
||||
.class_name = "channelsplit filter",
|
||||
.class_name = "channelsplit",
|
||||
.item_name = av_default_item_name,
|
||||
.option = options,
|
||||
.version = LIBAVUTIL_VERSION_INT,
|
||||
.category = AV_CLASS_CATEGORY_FILTER,
|
||||
};
|
||||
|
||||
static int init(AVFilterContext *ctx, const char *arg, void *opaque)
|
||||
|
|
|
@ -49,9 +49,11 @@ static const AVOption silencedetect_options[] = {
|
|||
};
|
||||
|
||||
static const AVClass silencedetect_class = {
|
||||
.class_name = "SilenceDetectContext",
|
||||
.class_name = "silencedetect",
|
||||
.item_name = av_default_item_name,
|
||||
.option = silencedetect_options,
|
||||
.version = LIBAVUTIL_VERSION_INT,
|
||||
.category = AV_CLASS_CATEGORY_FILTER,
|
||||
};
|
||||
|
||||
static av_cold int init(AVFilterContext *ctx, const char *args, void *opaque)
|
||||
|
|
|
@ -79,9 +79,11 @@ static const AVOption eval_options[]= {
|
|||
};
|
||||
|
||||
static const AVClass eval_class = {
|
||||
"AEvalSrcContext",
|
||||
av_default_item_name,
|
||||
eval_options
|
||||
.class_name = "aevalsrc",
|
||||
.item_name = av_default_item_name,
|
||||
.option = eval_options,
|
||||
.version = LIBAVUTIL_VERSION_INT,
|
||||
.category = AV_CLASS_CATEGORY_FILTER,
|
||||
};
|
||||
|
||||
static int init(AVFilterContext *ctx, const char *args, void *opaque)
|
||||
|
|
|
@ -55,9 +55,11 @@ static const AVOption anullsrc_options[]= {
|
|||
};
|
||||
|
||||
static const AVClass anullsrc_class = {
|
||||
"ANullSrcContext",
|
||||
av_default_item_name,
|
||||
anullsrc_options
|
||||
.class_name = "anullsrc",
|
||||
.item_name = av_default_item_name,
|
||||
.option = anullsrc_options,
|
||||
.version = LIBAVUTIL_VERSION_INT,
|
||||
.category = AV_CLASS_CATEGORY_FILTER,
|
||||
};
|
||||
|
||||
static int init(AVFilterContext *ctx, const char *args, void *opaque)
|
||||
|
|
|
@ -426,7 +426,7 @@ static const AVClass avfilter_class = {
|
|||
.class_name = "AVFilter",
|
||||
.item_name = default_filter_name,
|
||||
.version = LIBAVUTIL_VERSION_INT,
|
||||
.category = AV_CLASS_CATEGORY_FILTER,
|
||||
.category = AV_CLASS_CATEGORY_FILTER,
|
||||
};
|
||||
|
||||
int avfilter_open(AVFilterContext **filter_ctx, AVFilter *filter, const char *inst_name)
|
||||
|
|
|
@ -38,6 +38,7 @@ static const AVClass filtergraph_class = {
|
|||
.class_name = "AVFilterGraph",
|
||||
.item_name = av_default_item_name,
|
||||
.version = LIBAVUTIL_VERSION_INT,
|
||||
.category = AV_CLASS_CATEGORY_FILTER,
|
||||
};
|
||||
|
||||
AVFilterGraph *avfilter_graph_alloc(void)
|
||||
|
|
|
@ -81,9 +81,11 @@ static const AVOption movie_options[]= {
|
|||
};
|
||||
|
||||
static const AVClass movie_class = {
|
||||
"MovieContext",
|
||||
av_default_item_name,
|
||||
movie_options
|
||||
.class_name = "movie",
|
||||
.item_name = av_default_item_name,
|
||||
.option = movie_options,
|
||||
.version = LIBAVUTIL_VERSION_INT,
|
||||
.category = AV_CLASS_CATEGORY_FILTER,
|
||||
};
|
||||
|
||||
static av_cold int movie_common_init(AVFilterContext *ctx, const char *args, void *opaque,
|
||||
|
|
|
@ -55,9 +55,11 @@ static const AVOption ass_options[] = {
|
|||
};
|
||||
|
||||
static const AVClass ass_class = {
|
||||
"AssContext",
|
||||
av_default_item_name,
|
||||
ass_options
|
||||
.class_name = "ass",
|
||||
.item_name = av_default_item_name,
|
||||
.option = ass_options,
|
||||
.version = LIBAVUTIL_VERSION_INT,
|
||||
.category = AV_CLASS_CATEGORY_FILTER,
|
||||
};
|
||||
|
||||
/* libass supports a log level ranging from 0 to 7 */
|
||||
|
|
|
@ -58,9 +58,11 @@ static const AVOption blackdetect_options[] = {
|
|||
};
|
||||
|
||||
static const AVClass blackdetect_class = {
|
||||
.class_name = "BlackDetectContext",
|
||||
.class_name = "blackdetect",
|
||||
.item_name = av_default_item_name,
|
||||
.option = blackdetect_options,
|
||||
.version = LIBAVUTIL_VERSION_INT,
|
||||
.category = AV_CLASS_CATEGORY_FILTER,
|
||||
};
|
||||
|
||||
#define YUVJ_FORMATS \
|
||||
|
|
|
@ -152,9 +152,11 @@ static const AVOption delogo_options[]= {
|
|||
};
|
||||
|
||||
static const AVClass delogo_class = {
|
||||
.class_name = "DelogoContext",
|
||||
.class_name = "delogo",
|
||||
.item_name = av_default_item_name,
|
||||
.option = delogo_options,
|
||||
.version = LIBAVUTIL_VERSION_INT,
|
||||
.category = AV_CLASS_CATEGORY_FILTER,
|
||||
};
|
||||
|
||||
static int query_formats(AVFilterContext *ctx)
|
||||
|
|
|
@ -208,9 +208,11 @@ static const AVOption drawtext_options[]= {
|
|||
};
|
||||
|
||||
static const AVClass drawtext_class = {
|
||||
"DrawTextContext",
|
||||
av_default_item_name,
|
||||
drawtext_options
|
||||
.class_name = "drawtext",
|
||||
.item_name = av_default_item_name,
|
||||
.option = drawtext_options,
|
||||
.version = LIBAVUTIL_VERSION_INT,
|
||||
.category = AV_CLASS_CATEGORY_FILTER,
|
||||
};
|
||||
|
||||
#undef __FTERRORS_H__
|
||||
|
|
|
@ -72,9 +72,11 @@ static const AVOption fade_options[] = {
|
|||
};
|
||||
|
||||
static const AVClass fade_class = {
|
||||
"FadeContext",
|
||||
av_default_item_name,
|
||||
fade_options
|
||||
.class_name = "fade",
|
||||
.item_name = av_default_item_name,
|
||||
.option = fade_options,
|
||||
.version = LIBAVUTIL_VERSION_INT,
|
||||
.category = AV_CLASS_CATEGORY_FILTER,
|
||||
};
|
||||
|
||||
static av_cold int init(AVFilterContext *ctx, const char *args, void *opaque)
|
||||
|
|
|
@ -61,10 +61,11 @@ static const AVOption options[] = {
|
|||
};
|
||||
|
||||
static const AVClass class = {
|
||||
.class_name = "FPS filter",
|
||||
.class_name = "fps",
|
||||
.item_name = av_default_item_name,
|
||||
.option = options,
|
||||
.version = LIBAVUTIL_VERSION_INT,
|
||||
.category = AV_CLASS_CATEGORY_FILTER,
|
||||
};
|
||||
|
||||
static av_cold int init(AVFilterContext *ctx, const char *args, void *opaque)
|
||||
|
|
|
@ -92,9 +92,11 @@ static const AVOption lut_options[] = {
|
|||
};
|
||||
|
||||
static const AVClass lut_class = {
|
||||
"LutContext",
|
||||
av_default_item_name,
|
||||
lut_options
|
||||
.class_name = "lut",
|
||||
.item_name = av_default_item_name,
|
||||
.option = lut_options,
|
||||
.version = LIBAVUTIL_VERSION_INT,
|
||||
.category = AV_CLASS_CATEGORY_FILTER,
|
||||
};
|
||||
|
||||
static int init(AVFilterContext *ctx, const char *args, void *opaque)
|
||||
|
|
|
@ -104,9 +104,11 @@ static const AVOption overlay_options[] = {
|
|||
};
|
||||
|
||||
static const AVClass overlay_class = {
|
||||
"OverlayContext",
|
||||
av_default_item_name,
|
||||
overlay_options
|
||||
.class_name = "overlay",
|
||||
.item_name = av_default_item_name,
|
||||
.option = overlay_options,
|
||||
.version = LIBAVUTIL_VERSION_INT,
|
||||
.category = AV_CLASS_CATEGORY_FILTER,
|
||||
};
|
||||
|
||||
static av_cold int init(AVFilterContext *ctx, const char *args, void *opaque)
|
||||
|
|
|
@ -79,9 +79,11 @@ static const AVOption cellauto_options[] = {
|
|||
};
|
||||
|
||||
static const AVClass cellauto_class = {
|
||||
"CellAutoContext",
|
||||
av_default_item_name,
|
||||
cellauto_options
|
||||
.class_name = "cellauto",
|
||||
.item_name = av_default_item_name,
|
||||
.option = cellauto_options,
|
||||
.version = LIBAVUTIL_VERSION_INT,
|
||||
.category = AV_CLASS_CATEGORY_FILTER,
|
||||
};
|
||||
|
||||
#ifdef DEBUG
|
||||
|
|
|
@ -98,9 +98,11 @@ static const AVOption life_options[] = {
|
|||
};
|
||||
|
||||
static const AVClass life_class = {
|
||||
"LifeContext",
|
||||
av_default_item_name,
|
||||
life_options
|
||||
.class_name = "life",
|
||||
.item_name = av_default_item_name,
|
||||
.option = life_options,
|
||||
.version = LIBAVUTIL_VERSION_INT,
|
||||
.category = AV_CLASS_CATEGORY_FILTER,
|
||||
};
|
||||
|
||||
static int parse_rule(uint16_t *born_rule, uint16_t *stay_rule,
|
||||
|
|
|
@ -106,9 +106,11 @@ static const AVOption mandelbrot_options[] = {
|
|||
};
|
||||
|
||||
static const AVClass mandelbrot_class = {
|
||||
"MBContext",
|
||||
av_default_item_name,
|
||||
mandelbrot_options
|
||||
.class_name = "mandelbrot",
|
||||
.item_name = av_default_item_name,
|
||||
.option = mandelbrot_options,
|
||||
.version = LIBAVUTIL_VERSION_INT,
|
||||
.category = AV_CLASS_CATEGORY_FILTER,
|
||||
};
|
||||
|
||||
static av_cold int init(AVFilterContext *ctx, const char *args, void *opaque)
|
||||
|
|
|
@ -85,9 +85,11 @@ static const AVOption mptestsrc_options[]= {
|
|||
};
|
||||
|
||||
static const AVClass mptestsrc_class = {
|
||||
"MPTestContext",
|
||||
av_default_item_name,
|
||||
mptestsrc_options
|
||||
.class_name = "mptestsrc",
|
||||
.item_name = av_default_item_name,
|
||||
.option = mptestsrc_options,
|
||||
.version = LIBAVUTIL_VERSION_INT,
|
||||
.category = AV_CLASS_CATEGORY_FILTER,
|
||||
};
|
||||
|
||||
static double c[64];
|
||||
|
|
|
@ -159,9 +159,11 @@ static int request_frame(AVFilterLink *outlink)
|
|||
#if CONFIG_NULLSRC_FILTER
|
||||
|
||||
static const AVClass nullsrc_class = {
|
||||
.class_name = "NullSourceContext",
|
||||
.class_name = "nullsrc",
|
||||
.item_name = av_default_item_name,
|
||||
.option = testsrc_options,
|
||||
.version = LIBAVUTIL_VERSION_INT,
|
||||
.category = AV_CLASS_CATEGORY_FILTER,
|
||||
};
|
||||
|
||||
static void nullsrc_fill_picture(AVFilterContext *ctx, AVFilterBufferRef *picref) { }
|
||||
|
@ -194,9 +196,11 @@ AVFilter avfilter_vsrc_nullsrc = {
|
|||
#if CONFIG_TESTSRC_FILTER
|
||||
|
||||
static const AVClass testsrc_class = {
|
||||
.class_name = "TestSourceContext",
|
||||
.class_name = "testsrc",
|
||||
.item_name = av_default_item_name,
|
||||
.option = testsrc_options,
|
||||
.version = LIBAVUTIL_VERSION_INT,
|
||||
.category = AV_CLASS_CATEGORY_FILTER,
|
||||
};
|
||||
|
||||
/**
|
||||
|
@ -416,9 +420,11 @@ AVFilter avfilter_vsrc_testsrc = {
|
|||
#if CONFIG_RGBTESTSRC_FILTER
|
||||
|
||||
static const AVClass rgbtestsrc_class = {
|
||||
.class_name = "RGBTestSourceContext",
|
||||
.class_name = "rgbtestsrc",
|
||||
.item_name = av_default_item_name,
|
||||
.option = testsrc_options,
|
||||
.version = LIBAVUTIL_VERSION_INT,
|
||||
.category = AV_CLASS_CATEGORY_FILTER,
|
||||
};
|
||||
|
||||
#define R 0
|
||||
|
|
Loading…
Add table
Reference in a new issue