Skip to content

V
vlc
Commit 66b2d875 authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont
Browse files
Options

Fix potential deadlock when changing audio channels (fixes #2240)

parent 4d54fb13
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 3 deletions
src/audio_output/intf.c
View file @ 66b2d875
...@@ -286,15 +286,16 @@ static int aout_Restart( aout_instance_t * p_aout ) ...@@ -286,15 +286,16 @@ static int aout_Restart( aout_instance_t * p_aout )
return -1; return -1;
} }
/* Lock all inputs. */
aout_lock_input_fifos( p_aout );
for ( i = 0; i < p_aout->i_nb_inputs; i++ ) for ( i = 0; i < p_aout->i_nb_inputs; i++ )
{ {
aout_lock_input( p_aout, p_aout->pp_inputs[i] ); aout_lock_input( p_aout, p_aout->pp_inputs[i] );
aout_lock_input_fifos( p_aout );
aout_InputDelete( p_aout, p_aout->pp_inputs[i] ); aout_InputDelete( p_aout, p_aout->pp_inputs[i] );
aout_unlock_input_fifos( p_aout );
} }
/* Lock all inputs. */
aout_lock_input_fifos( p_aout );
aout_MixerDelete( p_aout ); aout_MixerDelete( p_aout );
/* Re-open the output plug-in. */ /* Re-open the output plug-in. */
......
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