From 102131da32b9168abfe65848e3ab4c4b9008a4cd Mon Sep 17 00:00:00 2001 From: Andreas Rheinhardt Date: Mon, 27 Sep 2021 23:17:19 +0200 Subject: avfilter/vf_convolve: Use formats list instead of query function Signed-off-by: Andreas Rheinhardt --- libavfilter/vf_convolve.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/libavfilter/vf_convolve.c b/libavfilter/vf_convolve.c index d7fdb9b121..4e6ab2cb88 100644 --- a/libavfilter/vf_convolve.c +++ b/libavfilter/vf_convolve.c @@ -78,8 +78,6 @@ static const AVOption convolve_options[] = { { NULL }, }; -static int query_formats(AVFilterContext *ctx) -{ static const enum AVPixelFormat pixel_fmts_fftfilt[] = { AV_PIX_FMT_YUVA444P, AV_PIX_FMT_YUV444P, AV_PIX_FMT_YUV440P, AV_PIX_FMT_YUVJ444P, AV_PIX_FMT_YUVJ440P, @@ -101,9 +99,6 @@ static int query_formats(AVFilterContext *ctx) AV_PIX_FMT_NONE }; - return ff_set_common_formats_from_list(ctx, pixel_fmts_fftfilt); -} - static int config_input_main(AVFilterLink *inlink) { ConvolveContext *s = inlink->dst->priv; @@ -668,7 +663,7 @@ const AVFilter ff_vf_convolve = { .priv_class = &convolve_class, FILTER_INPUTS(convolve_inputs), FILTER_OUTPUTS(convolve_outputs), - FILTER_QUERY_FUNC(query_formats), + FILTER_PIXFMTS_ARRAY(pixel_fmts_fftfilt), .flags = AVFILTER_FLAG_SUPPORT_TIMELINE_INTERNAL | AVFILTER_FLAG_SLICE_THREADS, }; @@ -698,7 +693,7 @@ const AVFilter ff_vf_deconvolve = { .priv_class = &deconvolve_class, FILTER_INPUTS(convolve_inputs), FILTER_OUTPUTS(convolve_outputs), - FILTER_QUERY_FUNC(query_formats), + FILTER_PIXFMTS_ARRAY(pixel_fmts_fftfilt), .flags = AVFILTER_FLAG_SUPPORT_TIMELINE_INTERNAL | AVFILTER_FLAG_SLICE_THREADS, }; -- cgit v1.2.3