[Mplayer-cvslog] CVS: main/libvo vo_x11.c,1.39,1.40

Alex Beregszaszi alex at mplayer.dev.hu
Sun Nov 18 15:09:58 CET 2001


Update of /cvsroot/mplayer/main/libvo
In directory mplayer:/var/tmp.root/cvs-serv25135

Modified Files:
	vo_x11.c 
Log Message:
fix to compile when SHM is disabled

Index: vo_x11.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vo_x11.c,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- vo_x11.c	6 Nov 2001 11:21:08 -0000	1.39
+++ vo_x11.c	18 Nov 2001 14:09:56 -0000	1.40
@@ -27,7 +27,7 @@
 
 #include <X11/Xlib.h>
 #include <X11/Xutil.h>
-#include <X11/extensions/XShm.h>
+//#include <X11/extensions/XShm.h>
 #ifdef HAVE_XF86VM
 #include <X11/extensions/xf86vmode.h>
 #endif
@@ -74,6 +74,8 @@
 
 //static int vo_dwidth,vo_dheight;
 
+static int Flip_Flag;
+
 #define SH_MEM
 
 #ifdef SH_MEM
@@ -91,8 +93,6 @@
 static XShmSegmentInfo Shminfo[1];
 static int gXErrorFlag;
 static int CompletionType=-1;
-
-static int Flip_Flag;
 
 static void InstallXErrorHandler()
 {




More information about the MPlayer-cvslog mailing list