[FFmpeg-cvslog] avfilter/af_amix: make independent of the channel layout

Michael Niedermayer git at videolan.org
Tue Sep 6 13:40:32 EEST 2016


ffmpeg | branch: master | Michael Niedermayer <michael at niedermayer.cc> | Tue Sep  6 00:16:54 2016 +0200| [3a3265899b869f0f1424d60f6b4f10b40d8cf9b0] | committer: Michael Niedermayer

avfilter/af_amix: make independent of the channel layout

Reviewed-by: Paul B Mahol <onemda at gmail.com>
Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>

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

 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 3e5e7ee..0e32c8a 100644
--- a/libavfilter/af_amix.c
+++ b/libavfilter/af_amix.c
@@ -235,7 +235,7 @@ static int config_output(AVFilterLink *outlink)
     if (!s->fifos)
         return AVERROR(ENOMEM);
 
-    s->nb_channels = av_get_channel_layout_nb_channels(outlink->channel_layout);
+    s->nb_channels = outlink->channels;
     for (i = 0; i < s->nb_inputs; i++) {
         s->fifos[i] = av_audio_fifo_alloc(outlink->format, s->nb_channels, 1024);
         if (!s->fifos[i])



More information about the ffmpeg-cvslog mailing list