* New OS X icon, courtesy of Joeri van Dooren <joeri@van.dooren.be> ;

* Mac OS X fix.

diff --git a/extras/MacOSX/Resources/vlc.icns b/extras/MacOSX/Resources/vlc.icns
index b624528d944c729a8666e99267888697f2225730..bb1af14b4c90f0bf72703fc3a753c580b1726176 100644 (file)
Binary files a/extras/MacOSX/Resources/vlc.icns and b/extras/MacOSX/Resources/vlc.icns differ

diff --git a/plugins/mpeg_vdec/video_decoder.c b/plugins/mpeg_vdec/video_decoder.c
index ce211786f7dd910204391f9ecc9c6c16aeb3a860..4b5602f37a0952d8607eca9252037d023fa47a82 100644 (file)
--- a/plugins/mpeg_vdec/video_decoder.c
+++ b/plugins/mpeg_vdec/video_decoder.c
@@ -2,7 +2,7 @@
  * video_decoder.c : video decoder thread
  *****************************************************************************
  * Copyright (C) 1999-2001 VideoLAN
- * $Id: video_decoder.c,v 1.7 2002/04/15 23:04:08 massiot Exp $
+ * $Id: video_decoder.c,v 1.8 2002/05/13 23:15:43 massiot Exp $
  *
  * Authors: Christophe Massiot <massiot@via.ecp.fr>
  *          Michel Lespinasse <walken@zoy.org>
@@ -117,7 +117,7 @@ void vdec_DestroyThread( vdec_thread_t *p_vdec )
  *****************************************************************************/
 void vdec_InitThread( vdec_thread_t * p_vdec )
 {
-#if !defined(SYS_BEOS)
+#if !defined(SYS_BEOS) && !defined(SYS_DARWIN)
 #   if VDEC_NICE
     /* Re-nice ourself - otherwise we would steal CPU time from the video
      * output, which would make a poor display. */