X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fmux%2Fwav.c;h=19383f96169b24907aef8c98d4392bf425624779;hb=596393719795e278fdbd8bfa3b7dd9ae2ecdd8e4;hp=a8a0f86ad16be5bb51906e8ba01c9156c8d9aa34;hpb=d3fe7f28797d4dba65ffcdd60bf932e758a48a9e;p=vlc diff --git a/modules/mux/wav.c b/modules/mux/wav.c index a8a0f86ad1..19383f9616 100644 --- a/modules/mux/wav.c +++ b/modules/mux/wav.c @@ -24,7 +24,6 @@ /***************************************************************************** * Preamble *****************************************************************************/ -#include #include #include @@ -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;