diff options
| author | Andreas Rheinhardt <andreas.rheinhardt@outlook.com> | 2021-09-27 21:36:09 +0200 |
|---|---|---|
| committer | Andreas Rheinhardt <andreas.rheinhardt@outlook.com> | 2021-10-05 18:58:27 +0200 |
| commit | e0e3c2f5d1ef68f0318fba1218d4795b7747c329 (patch) | |
| tree | 40c67b84ccac88cb0826a0258215524e143b3014 /libavfilter/vf_maskedmerge.c | |
| parent | 76effaa93832e511d466736b57b222d7727f7f75 (diff) | |
avfilter/vf_maskedmerge: Use formats list instead of query function
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
Diffstat (limited to 'libavfilter/vf_maskedmerge.c')
| -rw-r--r-- | libavfilter/vf_maskedmerge.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/libavfilter/vf_maskedmerge.c b/libavfilter/vf_maskedmerge.c index e3b3f01ef8..fc8f536922 100644 --- a/libavfilter/vf_maskedmerge.c +++ b/libavfilter/vf_maskedmerge.c @@ -37,8 +37,6 @@ static const AVOption maskedmerge_options[] = { AVFILTER_DEFINE_CLASS(maskedmerge); -static int query_formats(AVFilterContext *ctx) -{ static const enum AVPixelFormat pix_fmts[] = { AV_PIX_FMT_YUVA444P, AV_PIX_FMT_YUV444P, AV_PIX_FMT_YUV440P, AV_PIX_FMT_YUVJ444P, AV_PIX_FMT_YUVJ440P, @@ -61,9 +59,6 @@ static int query_formats(AVFilterContext *ctx) AV_PIX_FMT_NONE }; - return ff_set_common_formats_from_list(ctx, pix_fmts); -} - typedef struct ThreadData { AVFrame *base, *overlay, *mask; AVFrame *out; @@ -318,7 +313,7 @@ const AVFilter ff_vf_maskedmerge = { .activate = activate, FILTER_INPUTS(maskedmerge_inputs), FILTER_OUTPUTS(maskedmerge_outputs), - FILTER_QUERY_FUNC(query_formats), + FILTER_PIXFMTS_ARRAY(pix_fmts), .priv_class = &maskedmerge_class, .flags = AVFILTER_FLAG_SUPPORT_TIMELINE_INTERNAL | AVFILTER_FLAG_SLICE_THREADS, .process_command = ff_filter_process_command, |