Removes trailing spaces. Removes tabs.

[vlc] / modules / mux / wav.c

diff --git a/modules/mux/wav.c b/modules/mux/wav.c
index 8a97f284cb1ab5f1abb7ae8dede4955d7c9ef40c..e0a8edefd7a6ccc967252d3f0a208b31c0c0899a 100644 (file)
--- a/modules/mux/wav.c
+++ b/modules/mux/wav.c
@@ -1,7 +1,7 @@
 /*****************************************************************************
  * wav.c: wav muxer module for vlc
  *****************************************************************************
- * Copyright (C) 2004 the VideoLAN team
+ * Copyright (C) 2004, 2006 the VideoLAN team
  * $Id$
  *
  * Authors: Gildas Bazin <gbazin@videolan.org>
@@ -18,19 +18,18 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
 /*****************************************************************************
  * Preamble
  *****************************************************************************/
-#include <stdlib.h>
 
 #include <vlc/vlc.h>
-#include <vlc/aout.h>
-#include <vlc/sout.h>
-
-#include "codecs.h"
+#include <vlc_aout.h>
+#include <vlc_sout.h>
+#include <vlc_block.h>
+#include <vlc_codecs.h>
 
 /*****************************************************************************
  * Module descriptor
@@ -171,7 +170,7 @@ static int AddStream( sout_mux_t *p_mux, sout_input_t *p_input )
         return VLC_EGENERIC;
     }
 
-    msg_Dbg( p_mux, "adding input %i channels, %iHz",
+    msg_Dbg( p_mux, "adding %i input channels, %iHz",
              p_input->p_fmt->audio.i_channels,
              p_input->p_fmt->audio.i_rate );
 
@@ -179,7 +178,7 @@ static int AddStream( sout_mux_t *p_mux, sout_input_t *p_input )
     if( p_input->p_fmt->audio.i_physical_channels )
     {
         unsigned int i;
-        
+ 
         for( i = 0; i < sizeof(pi_channels_in)/sizeof(uint32_t); i++ )
         {
             if( p_input->p_fmt->audio.i_physical_channels & pi_channels_src[i])