[vlc-devel] commit: aout: lock output fifo later (Jakob Leben )

git version control git at videolan.org
Thu Nov 26 12:00:14 CET 2009


vlc | branch: master | Jakob Leben <jleben at videolan.org> | Thu Nov 26 11:58:46 2009 +0100| [bc5318a9a7daab38710a429dccfcaede641aed25] | committer: Jakob Leben 

aout: lock output fifo later

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

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

diff --git a/src/audio_output/output.c b/src/audio_output/output.c
index e8c9b6b..6cce790 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 );




More information about the vlc-devel mailing list