avfilter/vf_psnr: remove unnecessary check

[ffmpeg] / libavfilter / avf_showspatial.c

diff --git a/libavfilter/avf_showspatial.c b/libavfilter/avf_showspatial.c
index 5a7657f8453c8bef843aa1f81aa15be7acffded1..82d202a817af0ffb5dd91cccb0492ef729219b51 100644 (file)
--- a/libavfilter/avf_showspatial.c
+++ b/libavfilter/avf_showspatial.c
@@ -114,17 +114,17 @@ static int query_formats(AVFilterContext *ctx)
     int ret;
 
     formats = ff_make_format_list(sample_fmts);
-    if ((ret = ff_formats_ref         (formats, &inlink->out_formats        )) < 0 ||
+    if ((ret = ff_formats_ref         (formats, &inlink->outcfg.formats        )) < 0 ||
         (ret = ff_add_channel_layout  (&layout, AV_CH_LAYOUT_STEREO         )) < 0 ||
-        (ret = ff_channel_layouts_ref (layout , &inlink->out_channel_layouts)) < 0)
+        (ret = ff_channel_layouts_ref (layout , &inlink->outcfg.channel_layouts)) < 0)
         return ret;
 
     formats = ff_all_samplerates();
-    if ((ret = ff_formats_ref(formats, &inlink->out_samplerates)) < 0)
+    if ((ret = ff_formats_ref(formats, &inlink->outcfg.samplerates)) < 0)
         return ret;
 
     formats = ff_make_format_list(pix_fmts);
-    if ((ret = ff_formats_ref(formats, &outlink->in_formats)) < 0)
+    if ((ret = ff_formats_ref(formats, &outlink->incfg.formats)) < 0)
         return ret;
 
     return 0;
@@ -154,16 +154,13 @@ static int config_output(AVFilterLink *outlink)
     AVFilterContext *ctx = outlink->src;
     AVFilterLink *inlink = ctx->inputs[0];
     ShowSpatialContext *s = ctx->priv;
-    int i, fft_bits, h, w;
+    int i, fft_bits;
     float overlap;
 
     outlink->w = s->w;
     outlink->h = s->h;
     outlink->sample_aspect_ratio = (AVRational){1,1};
 
-    h = s->h;
-    w = s->w;
-
     s->buf_size = 1 << av_log2(s->win_size);
     s->win_size = s->buf_size;
     fft_bits = av_log2(s->win_size);
@@ -361,7 +358,7 @@ static const AVFilterPad showspatial_outputs[] = {
     { NULL }
 };
 
-AVFilter ff_avf_showspatial = {
+const AVFilter ff_avf_showspatial = {
     .name          = "showspatial",
     .description   = NULL_IF_CONFIG_SMALL("Convert input audio to a spatial video output."),
     .uninit        = uninit,