Merge commit 'aeaa108bafa11db290f1ada0e22dbfbd655cf2ba'

[ffmpeg] / libavfilter / af_sidechaincompress.c

diff --git a/libavfilter/af_sidechaincompress.c b/libavfilter/af_sidechaincompress.c
index 55bed438446c25b2134e9fc559628d22a1c99b06..888049eaf0e0fbca7eb03deb48c697c8a2f41adc 100644 (file)
--- a/libavfilter/af_sidechaincompress.c
+++ b/libavfilter/af_sidechaincompress.c
@@ -241,14 +241,13 @@ static int activate(AVFilterContext *ctx)
     }
     FF_FILTER_FORWARD_STATUS(ctx->inputs[0], ctx->outputs[0]);
     FF_FILTER_FORWARD_STATUS(ctx->inputs[1], ctx->outputs[0]);
-    /* TODO reindent */
-        if (ff_outlink_frame_wanted(ctx->outputs[0])) {
-            if (!av_audio_fifo_size(s->fifo[0]))
-                ff_inlink_request_frame(ctx->inputs[0]);
-            if (!av_audio_fifo_size(s->fifo[1]))
-                ff_inlink_request_frame(ctx->inputs[1]);
-        }
-        return 0;
+    if (ff_outlink_frame_wanted(ctx->outputs[0])) {
+        if (!av_audio_fifo_size(s->fifo[0]))
+            ff_inlink_request_frame(ctx->inputs[0]);
+        if (!av_audio_fifo_size(s->fifo[1]))
+            ff_inlink_request_frame(ctx->inputs[1]);
+    }
+    return 0;
 }
 
 static int query_formats(AVFilterContext *ctx)
@@ -368,7 +367,7 @@ static int acompressor_filter_frame(AVFilterLink *inlink, AVFrame *in)
     if (av_frame_is_writable(in)) {
         out = in;
     } else {
-        out = ff_get_audio_buffer(inlink, in->nb_samples);
+        out = ff_get_audio_buffer(outlink, in->nb_samples);
         if (!out) {
             av_frame_free(&in);
             return AVERROR(ENOMEM);