avfilter/af_acrossover: simplify coefficients

[ffmpeg] / libavfilter / af_agate.c

diff --git a/libavfilter/af_agate.c b/libavfilter/af_agate.c
index 0609dc222e093c9b9cf3ea924186944ce0c552bb..9efc6f9c4068d779aa280314eadde9a0fedda1c9 100644 (file)
--- a/libavfilter/af_agate.c
+++ b/libavfilter/af_agate.c
@@ -318,7 +318,7 @@ static int activate(AVFilterContext *ctx)
 
         dst = (double *)out->data[0];
         out->pts = s->pts;
-        s->pts += nb_samples;
+        s->pts += av_rescale_q(nb_samples, (AVRational){1, ctx->outputs[0]->sample_rate}, ctx->outputs[0]->time_base);
 
         gate(s, (double *)in[0]->data[0], dst,
              (double *)in[1]->data[0], nb_samples,
@@ -353,20 +353,20 @@ static int scquery_formats(AVFilterContext *ctx)
     };
     int ret, i;
 
-    if (!ctx->inputs[0]->in_channel_layouts ||
-        !ctx->inputs[0]->in_channel_layouts->nb_channel_layouts) {
+    if (!ctx->inputs[0]->incfg.channel_layouts ||
+        !ctx->inputs[0]->incfg.channel_layouts->nb_channel_layouts) {
         av_log(ctx, AV_LOG_WARNING,
                "No channel layout for input 1\n");
             return AVERROR(EAGAIN);
     }
 
-    if ((ret = ff_add_channel_layout(&layouts, ctx->inputs[0]->in_channel_layouts->channel_layouts[0])) < 0 ||
-        (ret = ff_channel_layouts_ref(layouts, &ctx->outputs[0]->in_channel_layouts)) < 0)
+    if ((ret = ff_add_channel_layout(&layouts, ctx->inputs[0]->incfg.channel_layouts->channel_layouts[0])) < 0 ||
+        (ret = ff_channel_layouts_ref(layouts, &ctx->outputs[0]->incfg.channel_layouts)) < 0)
         return ret;
 
     for (i = 0; i < 2; i++) {
         layouts = ff_all_channel_counts();
-        if ((ret = ff_channel_layouts_ref(layouts, &ctx->inputs[i]->out_channel_layouts)) < 0)
+        if ((ret = ff_channel_layouts_ref(layouts, &ctx->inputs[i]->outcfg.channel_layouts)) < 0)
             return ret;
     }