Removes trailing spaces. Removes tabs.

[vlc] / modules / audio_filter / channel_mixer / simple.c

diff --git a/modules/audio_filter/channel_mixer/simple.c b/modules/audio_filter/channel_mixer/simple.c
index 8cbd3d2e714c448c8dadf821de31d5d8cb8d2517..7c9c448782708134ba03e1d625ff8c8cebb27405 100644 (file)
--- a/modules/audio_filter/channel_mixer/simple.c
+++ b/modules/audio_filter/channel_mixer/simple.c
@@ -24,12 +24,9 @@
 /*****************************************************************************
  * Preamble
  *****************************************************************************/
-#include <stdlib.h>                                      /* malloc(), free() */
-#include <string.h>
 
 #include <vlc/vlc.h>
-#include "audio_output.h"
-#include "aout_internal.h"
+#include <vlc_aout.h>
 
 /*****************************************************************************
  * Local prototypes
@@ -70,7 +67,7 @@ static int Create( vlc_object_t *p_this )
 
     /* Only conversion to Stereo and 4.0 right now */
     if( p_filter->output.i_physical_channels !=
-        (AOUT_CHAN_LEFT | AOUT_CHAN_RIGHT) 
+        (AOUT_CHAN_LEFT | AOUT_CHAN_RIGHT)
         && p_filter->output.i_physical_channels !=
         ( AOUT_CHAN_LEFT | AOUT_CHAN_RIGHT |
         AOUT_CHAN_REARLEFT | AOUT_CHAN_REARRIGHT) )