[vlc-devel] commit: Fixed 4.0 rear center 3.0 test after 4 rear center downmix support. (Laurent Aimar )

[git version control]

vlc | branch: 1.0-bugfix | Laurent Aimar <fenrir at videolan.org> | Mon Sep 14 20:46:40 2009 +0200| [46c83c6f26eddb757b562db0b4e43e1e283e9072] | committer: Jean-Baptiste Kempf 

Fixed 4.0 rear center 3.0 test after 4 rear center downmix support.
(cherry picked from commit 8c61e8b37a5267498af3f2bb983a84632886d1ff)

Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=46c83c6f26eddb757b562db0b4e43e1e283e9072
---

 modules/audio_filter/channel_mixer/simple.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/modules/audio_filter/channel_mixer/simple.c b/modules/audio_filter/channel_mixer/simple.c
index 365838d..7b3d44b 100644
--- a/modules/audio_filter/channel_mixer/simple.c
+++ b/modules/audio_filter/channel_mixer/simple.c
@@ -107,11 +107,11 @@ static void DoWork( aout_instance_t * p_aout, aout_filter_t * p_filter,
     const bool b_input_5_0 = !b_input_7_0 &&
                              ( (i_input_physical & AOUT_CHANS_5_0) == AOUT_CHANS_5_0 ||
                                (i_input_physical & AOUT_CHANS_5_0_MIDDLE) == AOUT_CHANS_5_0_MIDDLE );
-    const bool b_input_3_0 = !b_input_7_0 && !b_input_5_0 &&
+    const bool b_input_4_center_rear =  !b_input_7_0 && !b_input_5_0 &&
+                             (i_input_physical & ~AOUT_CHAN_LFE) == AOUT_CHANS_4_CENTER_REAR;
+    const bool b_input_3_0 = !b_input_7_0 && !b_input_5_0 && !b_input_4_center_rear &&
                              (i_input_physical & ~AOUT_CHAN_LFE) == AOUT_CHANS_3_0;
 
-    const bool b_input_4_center_rear = (i_input_physical & ~AOUT_CHAN_LFE) == AOUT_CHANS_4_CENTER_REAR;
-
     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;