From: Rémi Denis-Courmont <remi@remlab.net>
Date: Sun, 29 Nov 2009 11:06:53 +0000 (+0200)
Subject: Lock order fix
X-Git-Tag: 1.1.0-ff~2329
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=d23bca379e5eed844f90c74741f41d2107e1532b;p=vlc

Lock order fix
---

diff --git a/src/audio_output/mixer.c b/src/audio_output/mixer.c
index 502833e30c..b4b2c26dd0 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;