Skip to content

V
vlc-gpu
Commit 37e6859a authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont
Browse files
Options

Remove redumdant audio format comparisons 

aout_FiltersCreatePipeline() deals with it internally.
parent 43c4b5aa
Show whitespace changes
Inline Side-by-side
Showing with 17 additions and 24 deletions
src/audio_output/input.c
View file @ 37e6859a
...@@ -344,9 +344,6 @@ int aout_InputNew( aout_instance_t * p_aout, aout_input_t * p_input, const aout_ ...@@ -344,9 +344,6 @@ int aout_InputNew( aout_instance_t * p_aout, aout_input_t * p_input, const aout_
} }
/* complete the filter chain if necessary */ /* complete the filter chain if necessary */
if ( !AOUT_FMTS_IDENTICAL( &chain_input_format,
&p_filter->fmt_in.audio ) )
{
if ( aout_FiltersCreatePipeline( p_aout, p_input->pp_filters, if ( aout_FiltersCreatePipeline( p_aout, p_input->pp_filters,
&p_input->i_nb_filters, &p_input->i_nb_filters,
&chain_input_format, &chain_input_format,
...@@ -362,7 +359,6 @@ int aout_InputNew( aout_instance_t * p_aout, aout_input_t * p_input, const aout_ ...@@ -362,7 +359,6 @@ int aout_InputNew( aout_instance_t * p_aout, aout_input_t * p_input, const aout_
psz_parser = psz_next; psz_parser = psz_next;
continue; continue;
} }
}
/* success */ /* success */
p_input->pp_filters[p_input->i_nb_filters++] = p_filter; p_input->pp_filters[p_input->i_nb_filters++] = p_filter;
...@@ -381,8 +377,6 @@ int aout_InputNew( aout_instance_t * p_aout, aout_input_t * p_input, const aout_ ...@@ -381,8 +377,6 @@ int aout_InputNew( aout_instance_t * p_aout, aout_input_t * p_input, const aout_
free( psz_scaletempo ); free( psz_scaletempo );
/* complete the filter chain if necessary */ /* complete the filter chain if necessary */
if ( !AOUT_FMTS_IDENTICAL( &chain_input_format, &chain_output_format ) )
{
if ( aout_FiltersCreatePipeline( p_aout, p_input->pp_filters, if ( aout_FiltersCreatePipeline( p_aout, p_input->pp_filters,
&p_input->i_nb_filters, &p_input->i_nb_filters,
&chain_input_format, &chain_input_format,
...@@ -391,7 +385,6 @@ int aout_InputNew( aout_instance_t * p_aout, aout_input_t * p_input, const aout_ ...@@ -391,7 +385,6 @@ int aout_InputNew( aout_instance_t * p_aout, aout_input_t * p_input, const aout_
inputFailure( p_aout, p_input, "couldn't set an input pipeline" ); inputFailure( p_aout, p_input, "couldn't set an input pipeline" );
return -1; return -1;
} }
}
/* Create resamplers. */ /* Create resamplers. */
if ( !AOUT_FMT_NON_LINEAR( &p_aout->mixer_format ) ) if ( !AOUT_FMT_NON_LINEAR( &p_aout->mixer_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