[vlc-devel] commit: Fix previous commit - there is no vlc object here ( Rémi Denis-Courmont )

git version control git at videolan.org
Sun Apr 27 21:29:21 CEST 2008


vlc | branch: master | Rémi Denis-Courmont <rem at videolan.org> | Sun Apr 27 22:30:26 2008 +0300| [a4c609624d827f1dc9f1b213f4ae716c37e434b5]

Fix previous commit - there is no vlc object here

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

 modules/audio_output/auhal.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/modules/audio_output/auhal.c b/modules/audio_output/auhal.c
index 1b29a2d..a27429f 100644
--- a/modules/audio_output/auhal.c
+++ b/modules/audio_output/auhal.c
@@ -1228,7 +1228,7 @@ static int AudioStreamChangeFormat( aout_instance_t *p_aout, AudioStreamID i_str
         AudioStreamBasicDescription actual_format;
         mtime_t timeout = mtime() + 500000;
 
-        if( vlc_object_timedwait( &w, timeout ) )
+        if( vlc_cond_timedwait( &w.cond, &w.lock, timeout ) )
         {
             msg_Dbg( p_aout, "reached timeout" );
         }




More information about the vlc-devel mailing list