[FFmpeg-cvslog] avfilter/af_amix: use ff_all_channel_counts() instead of ff_all_channel_layouts()

[Paul B Mahol]

ffmpeg | branch: master | Paul B Mahol <onemda at gmail.com> | Sat Sep 10 13:05:31 2016 +0200| [b257266ee8b3f6db5d6135ba7c8fbcd3fba5c9dc] | committer: Paul B Mahol

avfilter/af_amix: use ff_all_channel_counts() instead of ff_all_channel_layouts()

Adds support for filtering frames with unknown channel layouts.

Signed-off-by: Paul B Mahol <onemda at gmail.com>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=b257266ee8b3f6db5d6135ba7c8fbcd3fba5c9dc
---

 libavfilter/af_amix.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavfilter/af_amix.c b/libavfilter/af_amix.c
index 0e32c8a..e18743e 100644
--- a/libavfilter/af_amix.c
+++ b/libavfilter/af_amix.c
@@ -521,7 +521,7 @@ static int query_formats(AVFilterContext *ctx)
     AVFilterChannelLayouts *layouts;
     int ret;
 
-    layouts = ff_all_channel_layouts();
+    layouts = ff_all_channel_counts();
     if (!layouts) {
         ret = AVERROR(ENOMEM);
         goto fail;