From f5362d3da1099a5cc0b1afd42f8223c6fc8ec8aa Mon Sep 17 00:00:00 2001 From: Andreas Rheinhardt Date: Mon, 27 Sep 2021 23:32:37 +0200 Subject: [PATCH] avfilter/vf_blend: Use formats list instead of query function Signed-off-by: Andreas Rheinhardt --- libavfilter/vf_blend.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/libavfilter/vf_blend.c b/libavfilter/vf_blend.c index 1401849bc3..e41bd62723 100644 --- a/libavfilter/vf_blend.c +++ b/libavfilter/vf_blend.c @@ -326,8 +326,6 @@ static av_cold int init(AVFilterContext *ctx) return 0; } -static int query_formats(AVFilterContext *ctx) -{ static const enum AVPixelFormat pix_fmts[] = { AV_PIX_FMT_YUVA444P, AV_PIX_FMT_YUVA422P, AV_PIX_FMT_YUVA420P, AV_PIX_FMT_YUVJ444P, AV_PIX_FMT_YUVJ440P, AV_PIX_FMT_YUVJ422P,AV_PIX_FMT_YUVJ420P, AV_PIX_FMT_YUVJ411P, @@ -349,9 +347,6 @@ static int query_formats(AVFilterContext *ctx) AV_PIX_FMT_NONE }; - return ff_set_common_formats_from_list(ctx, pix_fmts); -} - static av_cold void uninit(AVFilterContext *ctx) { BlendContext *s = ctx->priv; @@ -587,7 +582,7 @@ const AVFilter ff_vf_blend = { .activate = activate, FILTER_INPUTS(blend_inputs), FILTER_OUTPUTS(blend_outputs), - FILTER_QUERY_FUNC(query_formats), + FILTER_PIXFMTS_ARRAY(pix_fmts), .priv_class = &blend_class, .flags = AVFILTER_FLAG_SUPPORT_TIMELINE_INTERNAL | AVFILTER_FLAG_SLICE_THREADS, .process_command = process_command, @@ -645,7 +640,7 @@ const AVFilter ff_vf_tblend = { .uninit = uninit, FILTER_INPUTS(tblend_inputs), FILTER_OUTPUTS(tblend_outputs), - FILTER_QUERY_FUNC(query_formats), + FILTER_PIXFMTS_ARRAY(pix_fmts), .flags = AVFILTER_FLAG_SUPPORT_TIMELINE_INTERNAL | AVFILTER_FLAG_SLICE_THREADS, .process_command = process_command, };