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

[git version control]

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

Lock order fix
(cherry picked from commit d23bca379e5eed844f90c74741f41d2107e1532b)

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

 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 4f1f9b6..c8d31fa 100644
--- a/src/audio_output/mixer.c
+++ b/src/audio_output/mixer.c
@@ -98,8 +98,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. */
     memcpy( &exact_start_date, &p_aout->output.fifo.end_date,