[vlc-devel] commit: Lock order fix ( Rémi Denis-Courmont )

git version control git at videolan.org
Sun Nov 29 12:07:26 CET 2009


vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Sun Nov 29 13:06:53 2009 +0200| [d23bca379e5eed844f90c74741f41d2107e1532b] | committer: Rémi Denis-Courmont 

Lock order fix

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

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

diff --git a/src/audio_output/mixer.c b/src/audio_output/mixer.c
index 502833e..b4b2c26 100644
--- a/src/audio_output/mixer.c
+++ b/src/audio_output/mixer.c
@@ -130,8 +130,8 @@ static int MixBuffer( aout_instance_t * p_aout )
     }
 
 
-    aout_lock_output_fifo( p_aout );
     aout_lock_input_fifos( p_aout );
+    aout_lock_output_fifo( p_aout );
 
     /* Retrieve the date of the next buffer. */
     exact_start_date = p_aout->output.fifo.end_date;




More information about the vlc-devel mailing list