avfilter/vf_maskedminmax: Use formats list instead of query function

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
pull/369/head
Andreas Rheinhardt 3 years ago
parent 4418f6fadc
commit 76effaa938
  1. 9
      libavfilter/vf_maskedminmax.c

@ -63,8 +63,6 @@ static av_cold int maskedmin_init(AVFilterContext *ctx)
return 0; return 0;
} }
static int query_formats(AVFilterContext *ctx)
{
static const enum AVPixelFormat pix_fmts[] = { static const enum AVPixelFormat pix_fmts[] = {
AV_PIX_FMT_YUVA444P, AV_PIX_FMT_YUV444P, AV_PIX_FMT_YUV440P, AV_PIX_FMT_YUVA444P, AV_PIX_FMT_YUV444P, AV_PIX_FMT_YUV440P,
AV_PIX_FMT_YUVJ444P, AV_PIX_FMT_YUVJ440P, AV_PIX_FMT_YUVJ444P, AV_PIX_FMT_YUVJ440P,
@ -87,9 +85,6 @@ static int query_formats(AVFilterContext *ctx)
AV_PIX_FMT_NONE AV_PIX_FMT_NONE
}; };
return ff_set_common_formats_from_list(ctx, pix_fmts);
}
static void maskedmin8(const uint8_t *src, uint8_t *dst, const uint8_t *f1, const uint8_t *f2, int w) static void maskedmin8(const uint8_t *src, uint8_t *dst, const uint8_t *f1, const uint8_t *f2, int w)
{ {
for (int x = 0; x < w; x++) for (int x = 0; x < w; x++)
@ -330,7 +325,7 @@ const AVFilter ff_vf_maskedmin = {
.activate = activate, .activate = activate,
FILTER_INPUTS(maskedminmax_inputs), FILTER_INPUTS(maskedminmax_inputs),
FILTER_OUTPUTS(maskedminmax_outputs), FILTER_OUTPUTS(maskedminmax_outputs),
FILTER_QUERY_FUNC(query_formats), FILTER_PIXFMTS_ARRAY(pix_fmts),
.flags = AVFILTER_FLAG_SUPPORT_TIMELINE_INTERNAL | AVFILTER_FLAG_SLICE_THREADS, .flags = AVFILTER_FLAG_SUPPORT_TIMELINE_INTERNAL | AVFILTER_FLAG_SLICE_THREADS,
.process_command = ff_filter_process_command, .process_command = ff_filter_process_command,
}; };
@ -344,7 +339,7 @@ const AVFilter ff_vf_maskedmax = {
.activate = activate, .activate = activate,
FILTER_INPUTS(maskedminmax_inputs), FILTER_INPUTS(maskedminmax_inputs),
FILTER_OUTPUTS(maskedminmax_outputs), FILTER_OUTPUTS(maskedminmax_outputs),
FILTER_QUERY_FUNC(query_formats), FILTER_PIXFMTS_ARRAY(pix_fmts),
.flags = AVFILTER_FLAG_SUPPORT_TIMELINE_INTERNAL | AVFILTER_FLAG_SLICE_THREADS, .flags = AVFILTER_FLAG_SUPPORT_TIMELINE_INTERNAL | AVFILTER_FLAG_SLICE_THREADS,
.process_command = ff_filter_process_command, .process_command = ff_filter_process_command,
}; };

Loading…
Cancel
Save