summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTanu Kaskinen <tanuk@iki.fi>2013-04-09 14:52:54 +0300
committerTanu Kaskinen <tanuk@iki.fi>2013-04-09 14:56:18 +0300
commit179cacfc6620839cc9c4399e3f0a995bc499145f (patch)
treebf30363e6790fdeedd2378c08572eba7ccd1cd86
parent473b31f9de445101210ed120d58315dd36572600 (diff)
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
-rw-r--r--src/pulsecore/mix.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/pulsecore/mix.c b/src/pulsecore/mix.c
index 786ed75a..6ff6831a 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);
}