[Mplayerxp-cvslog] CVS: mplayerxp/mplayerxp/libvo osd.c,1.3,1.4 vo_x11.c,1.26,1.27 x11_common.c,1.14,1.15

[Nick K. <nic...@us...>]

Update of /cvsroot/mplayerxp/mplayerxp/mplayerxp/libvo
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17993/mplayerxp/libvo

Modified Files:
	osd.c vo_x11.c x11_common.c 
Log Message:
compilation fixes and some fixes by Pavel Arajums

Index: osd.c
===================================================================
RCS file: /cvsroot/mplayerxp/mplayerxp/mplayerxp/libvo/osd.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -p -u -d -r1.3 -r1.4
--- osd.c	7 Jun 2002 09:09:01 -0000	1.3
+++ osd.c	8 Jan 2005 07:05:48 -0000	1.4
@@ -17,9 +17,9 @@ extern int verbose; /* defined in mplaye
 
 #ifdef ARCH_X86
 #define CAN_COMPILE_X86_ASM
-static const uint64_t bFF  __attribute__((aligned(8))) = 0xFFFFFFFFFFFFFFFFULL;
-static const unsigned long long mask24lh  __attribute__((aligned(8))) = 0xFFFF000000000000ULL;
-static const unsigned long long mask24hl  __attribute__((aligned(8))) = 0x0000FFFFFFFFFFFFULL;
+static const uint64_t bFF __attribute__((used))  __attribute__((aligned(8))) = 0xFFFFFFFFFFFFFFFFULL;
+static const unsigned long long mask24lh  __attribute__((used)) __attribute__((aligned(8))) = 0xFFFF000000000000ULL;
+static const unsigned long long mask24hl  __attribute__((used)) __attribute__((aligned(8))) = 0x0000FFFFFFFFFFFFULL;
 #endif
 
 /*Note: we have C, X86-nommx, MMX, MMX2, 3DNOW version therse no 3DNOW+MMX2 one

Index: vo_x11.c
===================================================================
RCS file: /cvsroot/mplayerxp/mplayerxp/mplayerxp/libvo/vo_x11.c,v
retrieving revision 1.26
retrieving revision 1.27
diff -p -u -d -r1.26 -r1.27
--- vo_x11.c	30 Oct 2004 13:17:18 -0000	1.26
+++ vo_x11.c	8 Jan 2005 07:05:48 -0000	1.27
@@ -16,6 +16,7 @@
  *
  */
 
+#include <pthread.h>
 #include <limits.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -40,13 +41,18 @@
 
 
 /* special case for vo_x11 driver. We need mutexes */
-#include "../dec_ahead.h"
+//#include "../dec_ahead.h"
+#define MSG_D(args...)
+#define LOCK_VDECODING() { MSG_D(DA_PREFIX"LOCK_VDECODING\n"); pthread_mutex_lock(&vdecoding_mutex); }
+
 #include "../postproc/rgb2rgb.h" /* for MODE_RGB(BGR) definitions */
 #include "video_out_internal.h"
 #include "dri_vo.h"
 #include "../mp_image.h"
 LIBVO_EXTERN( x11 )
 
+extern pthread_mutex_t vdecoding_mutex;
+
 static vo_info_t vo_info =
 {
         "X11 ( XImage/Shm )",

Index: x11_common.c
===================================================================
RCS file: /cvsroot/mplayerxp/mplayerxp/mplayerxp/libvo/x11_common.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -p -u -d -r1.14 -r1.15
--- x11_common.c	23 Oct 2004 15:10:18 -0000	1.14
+++ x11_common.c	8 Jan 2005 07:05:48 -0000	1.15
@@ -294,7 +294,7 @@ void vo_x11_putkey_ext(int keysym){
    case XF86XK_AudioLowerVolume: mplayer_put_key(KEY_XF86_VOLUME_DN); break;
    case XF86XK_AudioMute:     mplayer_put_key(KEY_XF86_MUTE); break;
    case XF86XK_Eject:     mplayer_put_key(KEY_XF86_EJECT); break;
-   default:
+   default:;
   }
 }
 #endif