From b02929b70c49dc5cdc4abe559daef6eafa0090ed Mon Sep 17 00:00:00 2001 From: Andreas Rheinhardt Date: Mon, 27 Sep 2021 15:19:24 +0200 Subject: [PATCH] avfilter/vf_colormatrix: Use formats list instead of query function Signed-off-by: Andreas Rheinhardt --- libavfilter/vf_colormatrix.c | 17 ++++------------- 1 file changed, 4 insertions(+), 13 deletions(-) diff --git a/libavfilter/vf_colormatrix.c b/libavfilter/vf_colormatrix.c index 73bc0e9cf0..bee80c69cc 100644 --- a/libavfilter/vf_colormatrix.c +++ b/libavfilter/vf_colormatrix.c @@ -404,18 +404,6 @@ static int config_input(AVFilterLink *inlink) return 0; } -static int query_formats(AVFilterContext *ctx) -{ - static const enum AVPixelFormat pix_fmts[] = { - AV_PIX_FMT_YUV444P, - AV_PIX_FMT_YUV422P, - AV_PIX_FMT_YUV420P, - AV_PIX_FMT_UYVY422, - AV_PIX_FMT_NONE - }; - return ff_set_common_formats_from_list(ctx, pix_fmts); -} - static int filter_frame(AVFilterLink *link, AVFrame *in) { AVFilterContext *ctx = link->dst; @@ -509,7 +497,10 @@ const AVFilter ff_vf_colormatrix = { .init = init, FILTER_INPUTS(colormatrix_inputs), FILTER_OUTPUTS(colormatrix_outputs), - FILTER_QUERY_FUNC(query_formats), + FILTER_PIXFMTS(AV_PIX_FMT_YUV444P, + AV_PIX_FMT_YUV422P, + AV_PIX_FMT_YUV420P, + AV_PIX_FMT_UYVY422), .priv_class = &colormatrix_class, .flags = AVFILTER_FLAG_SUPPORT_TIMELINE_GENERIC | AVFILTER_FLAG_SLICE_THREADS, };