X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fmux%2Fwav.c;h=19383f96169b24907aef8c98d4392bf425624779;hb=596393719795e278fdbd8bfa3b7dd9ae2ecdd8e4;hp=a4d808bc01ebcdaab3c20c803d1cffd0237a6bb9;hpb=2cb472dba008f7d877ffe6bae9c5575253365282;p=vlc

diff --git a/modules/mux/wav.c b/modules/mux/wav.c
index a4d808bc01..19383f9616 100644
--- 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>
@@ -24,13 +24,12 @@
 /*****************************************************************************
  * 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])
@@ -286,7 +285,7 @@ static int Mux( sout_mux_t *p_mux )
     p_sys->b_header = VLC_FALSE;
 
     p_input = p_mux->pp_inputs[0];
-    while( p_input->p_fifo->i_depth > 0 )
+    while( block_FifoCount( p_input->p_fifo ) > 0 )
     {
         block_t *p_block = block_FifoGet( p_input->p_fifo );
         p_sys->i_data += p_block->i_buffer;