From 3731af037f2f898a43ddda26fe54be196d33710f Mon Sep 17 00:00:00 2001 From: Anton Khirnov Date: Tue, 1 Oct 2024 12:02:29 +0200 Subject: [PATCH] lavfi/f_select: switch to query_func2() Also, drop redundant calls that also happen implicitly in generic code. Signed-off-by: Paul B Mahol --- libavfilter/f_select.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/libavfilter/f_select.c b/libavfilter/f_select.c index a45d4be49c..d9ccaad554 100644 --- a/libavfilter/f_select.c +++ b/libavfilter/f_select.c @@ -538,13 +538,13 @@ const AVFilter ff_af_aselect = { #if CONFIG_SELECT_FILTER -static int query_formats(AVFilterContext *ctx) +static int query_formats(const AVFilterContext *ctx, + AVFilterFormatsConfig **cfg_in, + AVFilterFormatsConfig **cfg_out) { - SelectContext *select = ctx->priv; + const SelectContext *select = ctx->priv; - if (!select->do_scene_detect) { - return ff_default_query_formats(ctx); - } else { + if (select->do_scene_detect) { static const enum AVPixelFormat pix_fmts[] = { AV_PIX_FMT_RGB24, AV_PIX_FMT_BGR24, AV_PIX_FMT_RGBA, AV_PIX_FMT_ABGR, AV_PIX_FMT_BGRA, AV_PIX_FMT_GRAY8, @@ -553,8 +553,9 @@ static int query_formats(AVFilterContext *ctx) AV_PIX_FMT_YUV420P10, AV_PIX_FMT_NONE }; - return ff_set_common_formats_from_list(ctx, pix_fmts); + return ff_set_common_formats_from_list2(ctx, cfg_in, cfg_out, pix_fmts); } + return 0; } DEFINE_OPTIONS(select, AV_OPT_FLAG_VIDEO_PARAM|AV_OPT_FLAG_FILTERING_PARAM); @@ -587,7 +588,7 @@ const AVFilter ff_vf_select = { .priv_class = &select_class, .activate = activate, FILTER_INPUTS(select_inputs), - FILTER_QUERY_FUNC(query_formats), + FILTER_QUERY_FUNC2(query_formats), .flags = AVFILTER_FLAG_DYNAMIC_OUTPUTS | AVFILTER_FLAG_METADATA_ONLY, }; #endif /* CONFIG_SELECT_FILTER */