Merge commit '22cc57da64bfd73f2206969486b0aa183ee76479'

[ffmpeg] / libavfilter / af_sidechaincompress.c

diff --git a/libavfilter/af_sidechaincompress.c b/libavfilter/af_sidechaincompress.c
index f55556343078276d535a4c2252670a50b19b70a7..e45fd720d7c47b767800e0169dfbd1712fe7767d 100644 (file)
--- a/libavfilter/af_sidechaincompress.c
+++ b/libavfilter/af_sidechaincompress.c
@@ -161,7 +161,7 @@ static int filter_frame(AVFilterLink *link, AVFrame *frame)
     for (i = 0; i < 2; i++)
         if (link == ctx->inputs[i])
             break;
-    av_assert0(!s->input_frame[i]);
+    av_assert0(i < 2 && !s->input_frame[i]);
     s->input_frame[i] = frame;
 
     if (!s->input_frame[0] || !s->input_frame[1])
@@ -257,7 +257,7 @@ static int query_formats(AVFilterContext *ctx)
     ff_channel_layouts_ref(layouts, &ctx->outputs[0]->in_channel_layouts);
 
     for (i = 0; i < 2; i++) {
-        layouts = ff_all_channel_layouts();
+        layouts = ff_all_channel_counts();
         if (!layouts)
             return AVERROR(ENOMEM);
         ff_channel_layouts_ref(layouts, &ctx->inputs[i]->out_channel_layouts);