- backport of revision 13682

AUTHORS

@@ -144,7 +144,8 @@ E: babal(at)via.ecp.fr
 C: babal
 D: Win32 network input
 D: Win32 interface
-D: Headphone channel mixer
+D: Headphone channel mixer, Dolby Surround decoder
+D: Audio output core enhancements
 S: France
 
 N: Jean-Marc Dressler

modules/audio_filter/channel_mixer/headphone.c

@@ -315,12 +315,10 @@ static int Init ( aout_filter_t * p_filter , struct aout_filter_sys_t * p_data
     for ( i = 0 ; i < p_data->i_nb_atomic_operations ; i++ )
     {
         if ( p_data->i_overflow_buffer_size
-                < p_data->p_atomic_operations[i].i_delay * i_nb_channels
-                * sizeof (float) )
+                < p_data->p_atomic_operations[i].i_delay * 2 * sizeof (float) )
         {
             p_data->i_overflow_buffer_size
-                = p_data->p_atomic_operations[i].i_delay * i_nb_channels
-                * sizeof (float);
+                = p_data->p_atomic_operations[i].i_delay * 2 * sizeof (float);
         }
     }
     p_data->p_overflow_buffer = malloc ( p_data->i_overflow_buffer_size );