[vlc-devel] commit: Compilation fix related to the recent threading simplifications. Needs additional testing. ( Felix Paul Kühne )

[git version control]

vlc | branch: master | Felix Paul Kühne <fkuehne at videolan.org> | Fri Apr 25 11:31:24 2008 +0200| [8955d66081a98bc43bf9d0e85f9973174ee7b773]

Compilation fix related to the recent threading simplifications. Needs additional testing.

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

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

diff --git a/modules/audio_output/auhal.c b/modules/audio_output/auhal.c
index d1aeedb..5ae7784 100644
--- a/modules/audio_output/auhal.c
+++ b/modules/audio_output/auhal.c
@@ -221,7 +221,7 @@ static int Open( vlc_object_t * p_this )
     if( err != noErr )
     {
         /* Be tolerant, only give a warning here */
-        msg_Warn( p_aout, "could not check whether device [0x%x] is alive: %4.4s", p_sys->i_selected_dev, (char *)&err );
+        msg_Warn( p_aout, "could not check whether device [0x%x] is alive: %4.4s", (unsigned int)p_sys->i_selected_dev, (char *)&err );
         b_alive = false;
     }
 
@@ -1235,7 +1235,7 @@ static int AudioStreamChangeFormat( aout_instance_t *p_aout, AudioStreamID i_str
         timeout.tv_sec = now.tv_sec;
         timeout.tv_nsec = (now.tv_usec + 500000) * 1000;
 
-        if( pthread_cond_timedwait( &w.cond.cond, &w.lock.mutex, &timeout ) )
+        if( pthread_cond_timedwait( &w.cond, &w.lock, &timeout ) )
         {
             msg_Dbg( p_aout, "reached timeout" );
         }