Commit 0e2021e9 authored by Pierre d'Herbemont's avatar Pierre d'Herbemont

audio_output: Take the input_fifos lock where needed in aout_InputPlay.

(Should fix an other bunch of crash report in apple-bugreport).
parent f4132b2e
...@@ -484,6 +484,7 @@ int aout_InputPlay( aout_instance_t * p_aout, aout_input_t * p_input, ...@@ -484,6 +484,7 @@ int aout_InputPlay( aout_instance_t * p_aout, aout_input_t * p_input,
uint8_t *p_first_byte_to_mix; uint8_t *p_first_byte_to_mix;
vlc_mutex_lock( &p_aout->mixer_lock ); vlc_mutex_lock( &p_aout->mixer_lock );
vlc_mutex_lock( &p_aout->input_fifos_lock );
/* A little trick to avoid loosing our input fifo */ /* A little trick to avoid loosing our input fifo */
aout_FifoInit( p_aout, &dummy_fifo, p_aout->mixer.mixer.i_rate ); aout_FifoInit( p_aout, &dummy_fifo, p_aout->mixer.mixer.i_rate );
...@@ -495,6 +496,7 @@ int aout_InputPlay( aout_instance_t * p_aout, aout_input_t * p_input, ...@@ -495,6 +496,7 @@ int aout_InputPlay( aout_instance_t * p_aout, aout_input_t * p_input,
p_input->p_first_byte_to_mix = p_first_byte_to_mix; p_input->p_first_byte_to_mix = p_first_byte_to_mix;
p_input->fifo = fifo; p_input->fifo = fifo;
vlc_mutex_unlock( &p_aout->input_fifos_lock );
vlc_mutex_unlock( &p_aout->mixer_lock ); vlc_mutex_unlock( &p_aout->mixer_lock );
} }
......
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