From: Laurent Aimar <fenrir@videolan.org>
Date: Wed, 13 May 2009 19:59:13 +0000 (+0200)
Subject: Fixed downmixing to mono (close #2728).
X-Git-Tag: 1.1.0-ff~5963^2~4
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=f8822ed0e02723246bc9f5f601757dca8860a292;p=vlc

Fixed downmixing to mono (close #2728).
---

diff --git a/modules/audio_filter/channel_mixer/simple.c b/modules/audio_filter/channel_mixer/simple.c
index 02def5eee4..443c3cf19f 100644
--- a/modules/audio_filter/channel_mixer/simple.c
+++ b/modules/audio_filter/channel_mixer/simple.c
@@ -102,7 +102,8 @@ static void DoWork( aout_instance_t * p_aout, aout_filter_t * p_filter,
 
     const bool b_input_7_0 = (i_input_physical & ~AOUT_CHAN_LFE) == AOUT_CHANS_7_0;
     const bool b_input_5_0 = !b_input_7_0 &&
-                             (i_input_physical & (AOUT_CHANS_5_0|AOUT_CHANS_5_0_MIDDLE));
+                             ( (i_input_physical & AOUT_CHANS_5_0) == AOUT_CHANS_5_0 ||
+                               (i_input_physical & AOUT_CHANS_5_0_MIDDLE) == AOUT_CHANS_5_0_MIDDLE );
     int i_input_nb = aout_FormatNbChannels( &p_filter->input );
     int i_output_nb = aout_FormatNbChannels( &p_filter->output );
     float *p_dest = (float *)p_out_buf->p_buffer;