From c1b6165b7341a6a83d289463c65119a5843aae5a Mon Sep 17 00:00:00 2001 From: Andreas Rheinhardt Date: Sat, 11 Sep 2021 19:19:00 +0200 Subject: [PATCH] avfilter/vf_convolve: Deduplicate framesync auxiliary functions Reviewed-by: Paul B Mahol Signed-off-by: Andreas Rheinhardt --- libavfilter/vf_convolve.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/libavfilter/vf_convolve.c b/libavfilter/vf_convolve.c index 70d6793a50..65e7bde107 100644 --- a/libavfilter/vf_convolve.c +++ b/libavfilter/vf_convolve.c @@ -651,9 +651,11 @@ static const AVFilterPad convolve_outputs[] = { }, }; +FRAMESYNC_AUXILIARY_FUNCS(convolve, ConvolveContext, fs) + #if CONFIG_CONVOLVE_FILTER -FRAMESYNC_DEFINE_CLASS(convolve, ConvolveContext, fs); +FRAMESYNC_DEFINE_PURE_CLASS(convolve, "convolve", convolve, convolve_options); const AVFilter ff_vf_convolve = { .name = "convolve", @@ -683,12 +685,12 @@ static const AVOption deconvolve_options[] = { { NULL }, }; -FRAMESYNC_DEFINE_CLASS(deconvolve, ConvolveContext, fs); +FRAMESYNC_DEFINE_PURE_CLASS(deconvolve, "deconvolve", convolve, deconvolve_options); const AVFilter ff_vf_deconvolve = { .name = "deconvolve", .description = NULL_IF_CONFIG_SMALL("Deconvolve first video stream with second video stream."), - .preinit = deconvolve_framesync_preinit, + .preinit = convolve_framesync_preinit, .init = init, .uninit = uninit, .query_formats = query_formats,