]> git.sesse.net Git - vlc/commitdiff
Fix use of unitialized variable reported by David Thiel, fix from Christophe Massiot
authorRémi Denis-Courmont <rem@videolan.org>
Thu, 7 Jun 2007 16:52:32 +0000 (16:52 +0000)
committerRémi Denis-Courmont <rem@videolan.org>
Thu, 7 Jun 2007 16:52:32 +0000 (16:52 +0000)
src/audio_output/input.c

index 3104072105124d68b24794c9686767d5550ad68e..fd7fac954754a077017d6826c27683baafb0493d 100644 (file)
@@ -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,