From: Jakob Leben <jleben@videolan.org>
Date: Thu, 26 Nov 2009 10:58:46 +0000 (+0100)
Subject: aout: lock output fifo later
X-Git-Tag: 1.1.0-ff~2356
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=bc5318a9a7daab38710a429dccfcaede641aed25;p=vlc

aout: lock output fifo later
---

diff --git a/src/audio_output/output.c b/src/audio_output/output.c
index e8c9b6bc0f..6cce790486 100644
--- a/src/audio_output/output.c
+++ b/src/audio_output/output.c
@@ -53,14 +53,11 @@ int aout_OutputNew( aout_instance_t * p_aout,
         p_aout->output.output.i_rate = i_rate;
     aout_FormatPrepare( &p_aout->output.output );
 
-    aout_lock_output_fifo( p_aout );
-
     /* Find the best output plug-in. */
     p_aout->output.p_module = module_need( p_aout, "audio output", "$aout", false );
     if ( p_aout->output.p_module == NULL )
     {
         msg_Err( p_aout, "no suitable audio output module" );
-        aout_unlock_output_fifo( p_aout );
         return -1;
     }
 
@@ -163,6 +160,8 @@ int aout_OutputNew( aout_instance_t * p_aout,
 
     aout_FormatPrepare( &p_aout->output.output );
 
+    aout_lock_output_fifo( p_aout );
+
     /* Prepare FIFO. */
     aout_FifoInit( p_aout, &p_aout->output.fifo,
                    p_aout->output.output.i_rate );