From 48afab2685e3ce1a0e3ae7c21932fe3834c86482 Mon Sep 17 00:00:00 2001
From: Scott Mansell <phiren@gmail.com>
Date: Thu, 17 Jul 2014 18:41:18 +1200
Subject: [PATCH] Correct left/right volume for padded samples.

---
 Source/Core/AudioCommon/Mixer.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Source/Core/AudioCommon/Mixer.cpp b/Source/Core/AudioCommon/Mixer.cpp
index 24e8a1c128..ce13f50689 100644
--- a/Source/Core/AudioCommon/Mixer.cpp
+++ b/Source/Core/AudioCommon/Mixer.cpp
@@ -85,8 +85,8 @@ unsigned int CMixer::MixerFifo::Mix(short* samples, unsigned int numSamples, boo
 	short s[2];
 	s[0] = Common::swap16(m_buffer[(indexR - 1) & INDEX_MASK]);
 	s[1] = Common::swap16(m_buffer[(indexR - 2) & INDEX_MASK]);
-	s[0] = (s[0] * lvolume) >> 8;
-	s[1] = (s[1] * rvolume) >> 8;
+	s[0] = (s[0] * rvolume) >> 8;
+	s[1] = (s[1] * lvolume) >> 8;
 	for (; currentSample < numSamples * 2; currentSample += 2)
 	{
 		int sampleR = s[0] + samples[currentSample];