[FFmpeg-cvslog] avfilter/vf_convolve: Deduplicate framesync auxiliary functions

Andreas Rheinhardt git at videolan.org
Thu Sep 23 22:26:37 EEST 2021


ffmpeg | branch: master | Andreas Rheinhardt <andreas.rheinhardt at outlook.com> | Sat Sep 11 19:19:00 2021 +0200| [c1b6165b7341a6a83d289463c65119a5843aae5a] | committer: Andreas Rheinhardt

avfilter/vf_convolve: Deduplicate framesync auxiliary functions

Reviewed-by: Paul B Mahol <onemda at gmail.com>
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt at outlook.com>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=c1b6165b7341a6a83d289463c65119a5843aae5a
---

 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,



More information about the ffmpeg-cvslog mailing list