Skip to content

V
vlc-2-2
Commit 16db5271 authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont
Browse files
Options

Fix use of unitialized variable reported by David Thiel, fix from Christophe Massiot

parent bfdb4690
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 7 deletions
src/audio_output/input.c
View file @ 16db5271
......@@ -62,7 +62,7 @@ int aout_InputNew( aout_instance_t * p_aout, aout_input_t * p_input )
aout_FormatPrint( p_aout, "input", &p_input->input );
p_input->i_nb_filters = 0;
p_input->i_nb_resamplers = p_input->i_nb_filters = 0;
/* Prepare FIFO. */
aout_FifoInit( p_aout, &p_input->fifo, p_aout->mixer.mixer.i_rate );
......@@ -323,11 +323,7 @@ int aout_InputNew( aout_instance_t * p_aout, aout_input_t * p_input )
p_input->input_alloc.i_bytes_per_sec = -1;
/* Create resamplers. */
if ( AOUT_FMT_NON_LINEAR( &p_aout->mixer.mixer ) )
{
p_input->i_nb_resamplers = 0;
}
else
if ( !AOUT_FMT_NON_LINEAR( &p_aout->mixer.mixer ) )
{
chain_output_format.i_rate = (__MAX(p_input->input.i_rate,
p_aout->mixer.mixer.i_rate)
......@@ -337,7 +333,6 @@ int aout_InputNew( aout_instance_t * p_aout, aout_input_t * p_input )
/* Just in case... */
chain_output_format.i_rate++;
}
p_input->i_nb_resamplers = 0;
if ( aout_FiltersCreatePipeline( p_aout, p_input->pp_resamplers,
&p_input->i_nb_resamplers,
&chain_output_format,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment