diff mbox

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

Message ID 20160905221654.21467-1-michael@niedermayer.cc
State Accepted
Commit 3a3265899b869f0f1424d60f6b4f10b40d8cf9b0
Headers show

Commit Message

Michael Niedermayer Sept. 5, 2016, 10:16 p.m. UTC 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
---
 libavfilter/af_amix.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Paul B Mahol Sept. 5, 2016, 10:59 p.m. UTC | #1 
On 9/6/16, Michael Niedermayer <michael@niedermayer.cc> wrote:
> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
> ---
>  libavfilter/af_amix.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>

lgtm
Michael Niedermayer Sept. 6, 2016, 10:13 a.m. UTC | #2 
On Tue, Sep 06, 2016 at 12:59:12AM +0200, Paul B Mahol wrote:
> On 9/6/16, Michael Niedermayer <michael@niedermayer.cc> wrote:
> > Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
> > ---
> >  libavfilter/af_amix.c | 2 +-
> >  1 file changed, 1 insertion(+), 1 deletion(-)
> >
> 
> lgtm

applied

thx

[...]
diff mbox

Patch

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])