[vlc-devel] commit: Fix previous commit ( Rémi Denis-Courmont )

[git version control]

vlc | branch: 1.0-bugfix | Rémi Denis-Courmont <remi at remlab.net> | Sun Nov 29 18:22:51 2009 +0200| [553e55955c170e39faf6a35f21c7f85d985aa0a4] | committer: Rémi Denis-Courmont 

Fix previous commit
(cherry picked from commit b69d64d4abe24d01ceac7a02e2621454f10c49ba)

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

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

diff --git a/src/audio_output/output.c b/src/audio_output/output.c
index e1d0b72..8728427 100644
--- a/src/audio_output/output.c
+++ b/src/audio_output/output.c
@@ -344,8 +344,6 @@ aout_buffer_t * aout_OutputNextBuffer( aout_instance_t * p_aout,
         p_aout->output.fifo.pp_last = &p_aout->output.fifo.p_first;
     }
 
-    aout_unlock_output_fifo( p_aout );
-
     if ( !b_can_sleek &&
           ( (p_buffer->start_date - start_date > AOUT_PTS_TOLERANCE)
              || (start_date - p_buffer->start_date > AOUT_PTS_TOLERANCE) ) )
@@ -356,6 +354,9 @@ aout_buffer_t * aout_OutputNextBuffer( aout_instance_t * p_aout,
         msg_Warn( p_aout, "output date isn't PTS date, requesting "
                   "resampling (%"PRId64")", difference );
 
+        aout_FifoMoveDates( p_aout, &p_aout->output.fifo, difference );
+        aout_unlock_output_fifo( p_aout );
+
         aout_lock_input_fifos( p_aout );
         for ( i = 0; i < p_aout->i_nb_inputs; i++ )
         {
@@ -363,10 +364,10 @@ aout_buffer_t * aout_OutputNextBuffer( aout_instance_t * p_aout,
 
             aout_FifoMoveDates( p_aout, p_fifo, difference );
         }
-
-        aout_FifoMoveDates( p_aout, &p_aout->output.fifo, difference );
         aout_unlock_input_fifos( p_aout );
     }
+    else
+        aout_unlock_output_fifo( p_aout );
 
     return p_buffer;
 }