summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoralex <alex@b3059339-0415-0410-9bf9-f77b7e298cf2>2001-11-18 14:09:56 +0000
committeralex <alex@b3059339-0415-0410-9bf9-f77b7e298cf2>2001-11-18 14:09:56 +0000
commit15ea5ffcfca5b67ac09bdae6f5028ac2d4bb7d30 (patch)
treea2dd3dbeabb84f78d0322e45e243e080c2c5dc20
parent2a3e9d86da4eec77b59850aaf9ad56eeb0d740a2 (diff)
downloadmpv-15ea5ffcfca5b67ac09bdae6f5028ac2d4bb7d30.tar.bz2
mpv-15ea5ffcfca5b67ac09bdae6f5028ac2d4bb7d30.tar.xz
fix to compile when SHM is disabled
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@2970 b3059339-0415-0410-9bf9-f77b7e298cf2
-rw-r--r--libvo/vo_x11.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/libvo/vo_x11.c b/libvo/vo_x11.c
index 1fe561f368..f541e0120a 100644
--- a/libvo/vo_x11.c
+++ b/libvo/vo_x11.c
@@ -27,7 +27,7 @@ LIBVO_EXTERN( x11 )
#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 X_already_started=0;
//static int vo_dwidth,vo_dheight;
+static int Flip_Flag;
+
#define SH_MEM
#ifdef SH_MEM
@@ -92,8 +94,6 @@ static XShmSegmentInfo Shminfo[1];
static int gXErrorFlag;
static int CompletionType=-1;
-static int Flip_Flag;
-
static void InstallXErrorHandler()
{
//XSetErrorHandler( HandleXError );