X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavfilter%2Fvf_convolve.c;h=a0066bbd39f4d5dda6c6a5b535a7d3bf105b3a23;hb=a04ad248a05e7b613abe09b3bb067f555108d794;hp=982eda1cbcf03c493150b65ae9f7f529107c729c;hpb=22219a3ac46ac18f797c94e4619a34728556786c;p=ffmpeg

diff --git a/libavfilter/vf_convolve.c b/libavfilter/vf_convolve.c
index 982eda1cbcf..a0066bbd39f 100644
--- a/libavfilter/vf_convolve.c
+++ b/libavfilter/vf_convolve.c
@@ -91,7 +91,7 @@ static int query_formats(AVFilterContext *ctx)
         AV_PIX_FMT_GBRP, AV_PIX_FMT_GBRP9, AV_PIX_FMT_GBRP10,
         AV_PIX_FMT_GBRP12, AV_PIX_FMT_GBRP14, AV_PIX_FMT_GBRP16,
         AV_PIX_FMT_GBRAP, AV_PIX_FMT_GBRAP10, AV_PIX_FMT_GBRAP12, AV_PIX_FMT_GBRAP16,
-        AV_PIX_FMT_GRAY8, AV_PIX_FMT_GRAY9, AV_PIX_FMT_GRAY10, AV_PIX_FMT_GRAY12, AV_PIX_FMT_GRAY16,
+        AV_PIX_FMT_GRAY8, AV_PIX_FMT_GRAY9, AV_PIX_FMT_GRAY10, AV_PIX_FMT_GRAY12, AV_PIX_FMT_GRAY14, AV_PIX_FMT_GRAY16,
         AV_PIX_FMT_NONE
     };
 
@@ -590,7 +590,9 @@ static av_cold void uninit(AVFilterContext *ctx)
 
         for (j = 0; j < MAX_THREADS; j++) {
             av_fft_end(s->fft[i][j]);
+            s->fft[i][j] = NULL;
             av_fft_end(s->ifft[i][j]);
+            s->ifft[i][j] = NULL;
         }
     }
 
@@ -623,7 +625,7 @@ static const AVFilterPad convolve_outputs[] = {
 
 FRAMESYNC_DEFINE_CLASS(convolve, ConvolveContext, fs);
 
-AVFilter ff_vf_convolve = {
+const AVFilter ff_vf_convolve = {
     .name          = "convolve",
     .description   = NULL_IF_CONFIG_SMALL("Convolve first video stream with second video stream."),
     .preinit       = convolve_framesync_preinit,
@@ -653,7 +655,7 @@ static const AVOption deconvolve_options[] = {
 
 FRAMESYNC_DEFINE_CLASS(deconvolve, ConvolveContext, fs);
 
-AVFilter ff_vf_deconvolve = {
+const AVFilter ff_vf_deconvolve = {
     .name          = "deconvolve",
     .description   = NULL_IF_CONFIG_SMALL("Deconvolve first video stream with second video stream."),
     .preinit       = deconvolve_framesync_preinit,