[vlc-devel] commit: audio_output: Take the input_fifos lock where needed in aout_InputPlay. (Pierre d' Herbemont )

[git version control]

vlc | branch: master | Pierre d'Herbemont <pdherbemont at videolan.org> | Tue Aug 12 01:17:09 2008 +0200| [0e2021e9c6a3ff6cb04282de62f783c06a9ac914] | committer: 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).

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=0e2021e9c6a3ff6cb04282de62f783c06a9ac914
---

 src/audio_output/input.c |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/src/audio_output/input.c b/src/audio_output/input.c
index c68eab6..95681e8 100644
--- a/src/audio_output/input.c
+++ b/src/audio_output/input.c
@@ -484,6 +484,7 @@ int aout_InputPlay( aout_instance_t * p_aout, aout_input_t * p_input,
         uint8_t     *p_first_byte_to_mix;
 
         vlc_mutex_lock( &p_aout->mixer_lock );
+        vlc_mutex_lock( &p_aout->input_fifos_lock );
 
         /* A little trick to avoid loosing our input fifo */
         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,
         p_input->p_first_byte_to_mix = p_first_byte_to_mix;
         p_input->fifo = fifo;
 
+        vlc_mutex_unlock( &p_aout->input_fifos_lock );
         vlc_mutex_unlock( &p_aout->mixer_lock );
     }