Merge commit 'f290e48d86e10f34b5ddc519127636bcebec7c43'

[ffmpeg] / libavfilter / af_compand.c

diff --git a/libavfilter/af_compand.c b/libavfilter/af_compand.c
index 610787f54e0f3609ffd00b1717dd194ce5fed9a6..3848d67bd9c6688a9a5ff3da7a263be38a82ee71 100644 (file)
--- a/libavfilter/af_compand.c
+++ b/libavfilter/af_compand.c
@@ -109,7 +109,7 @@ static int query_formats(AVFilterContext *ctx)
     };
     int ret;
 
-    layouts = ff_all_channel_layouts();
+    layouts = ff_all_channel_counts();
     if (!layouts)
         return AVERROR(ENOMEM);
     ret = ff_set_common_channel_layouts(ctx, layouts);
@@ -531,7 +531,6 @@ static int config_output(AVFilterLink *outlink)
     if (err)
         return err;
 
-    outlink->flags |= FF_LINK_FLAG_REQUEST_LOOP;
     s->compand = compand_delay;
     return 0;
 }