From 502b48c3575c35e23fb5d6fe1add200bdc525b74 Mon Sep 17 00:00:00 2001 From: Andreas Rheinhardt Date: Mon, 27 Sep 2021 21:45:08 +0200 Subject: [PATCH] avfilter/vf_identity: Use formats list instead of query function Signed-off-by: Andreas Rheinhardt --- libavfilter/vf_identity.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/libavfilter/vf_identity.c b/libavfilter/vf_identity.c index 22ee744c2d..64ec31bb31 100644 --- a/libavfilter/vf_identity.c +++ b/libavfilter/vf_identity.c @@ -241,8 +241,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_GRAY8, AV_PIX_FMT_GRAY9, AV_PIX_FMT_GRAY10, AV_PIX_FMT_GRAY12, AV_PIX_FMT_GRAY14, AV_PIX_FMT_GRAY16, #define PF_NOALPHA(suf) AV_PIX_FMT_YUV420##suf, AV_PIX_FMT_YUV422##suf, AV_PIX_FMT_YUV444##suf @@ -258,9 +256,6 @@ static int query_formats(AVFilterContext *ctx) AV_PIX_FMT_NONE }; - return ff_set_common_formats_from_list(ctx, pix_fmts); -} - static int config_input_ref(AVFilterLink *inlink) { const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(inlink->format); @@ -416,7 +411,7 @@ const AVFilter ff_vf_identity = { .priv_class = &identity_class, FILTER_INPUTS(identity_inputs), FILTER_OUTPUTS(identity_outputs), - FILTER_QUERY_FUNC(query_formats), + FILTER_PIXFMTS_ARRAY(pix_fmts), .flags = AVFILTER_FLAG_SUPPORT_TIMELINE_INTERNAL | AVFILTER_FLAG_SLICE_THREADS, }; @@ -438,7 +433,7 @@ const AVFilter ff_vf_msad = { .priv_class = &msad_class, FILTER_INPUTS(identity_inputs), FILTER_OUTPUTS(identity_outputs), - FILTER_QUERY_FUNC(query_formats), + FILTER_PIXFMTS_ARRAY(pix_fmts), .flags = AVFILTER_FLAG_SUPPORT_TIMELINE_INTERNAL | AVFILTER_FLAG_SLICE_THREADS, };