From: Tanu Kaskinen <tanuk@iki.fi>
Date: Tue, 9 Apr 2013 11:52:54 +0000 (+0300)
Subject: mix: Mix the right number of streams
X-Git-Tag: v3.99.1~9
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=179cacfc6620839cc9c4399e3f0a995bc499145f;p=platform%2Fupstream%2Fpulseaudio.git

mix: Mix the right number of streams

Passing channels instead of nstreams to pa_mix_ch2_s16ne() caused that
only the first two streams got mixed.

BugLink: https://bugs.freedesktop.org/show_bug.cgi?id=63093
---

diff --git a/src/pulsecore/mix.c b/src/pulsecore/mix.c
index 786ed75..6ff6831 100644
--- a/src/pulsecore/mix.c
+++ b/src/pulsecore/mix.c
@@ -249,7 +249,7 @@ static void pa_mix_s16ne_c(pa_mix_info streams[], unsigned nstreams, unsigned ch
     else if (nstreams == 2)
         pa_mix2_s16ne(streams, channels, data, length);
     else if (channels == 2)
-        pa_mix_ch2_s16ne(streams, channels, data, length);
+        pa_mix_ch2_s16ne(streams, nstreams, data, length);
     else
         pa_mix_generic_s16ne(streams, nstreams, channels, data, length);
 }