summaryrefslogtreecommitdiffstats
path: root/libvo
diff options
context:
space:
mode:
authordiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2008-10-16 18:19:36 +0000
committerdiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2008-10-16 18:19:36 +0000
commita290af1657a7c024e903a875fe1a886407aadc16 (patch)
treecc454a87856c8927751976566ad423f2b0e39f69 /libvo
parent11e54c5b679385fc0a91a0360dce84a279682a9f (diff)
downloadmpv-a290af1657a7c024e903a875fe1a886407aadc16.tar.bz2
mpv-a290af1657a7c024e903a875fe1a886407aadc16.tar.xz
Move X11_FULLSCREEN definition to x11_common.h where it belongs.
config.h should only contain option definitions, no logic. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27784 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libvo')
-rw-r--r--libvo/vo_dxr2.c3
-rw-r--r--libvo/x11_common.h6
2 files changed, 6 insertions, 3 deletions
diff --git a/libvo/vo_dxr2.c b/libvo/vo_dxr2.c
index 93ad86f610..36281aa145 100644
--- a/libvo/vo_dxr2.c
+++ b/libvo/vo_dxr2.c
@@ -20,10 +20,7 @@
#include "sub.h"
#include "get_path.h"
#include "libmpdemux/mpeg_packetizer.h"
-
-#ifdef X11_FULLSCREEN
#include "x11_common.h"
-#endif
#include <dxr2ioctl.h>
diff --git a/libvo/x11_common.h b/libvo/x11_common.h
index 7272378f9a..50bed0f599 100644
--- a/libvo/x11_common.h
+++ b/libvo/x11_common.h
@@ -4,6 +4,12 @@
#include <X11/Xlib.h>
#include <X11/Xutil.h>
+#include "config.h"
+
+#if defined(CONFIG_GL) || defined(CONFIG_X11) || defined(CONFIG_XV)
+#define X11_FULLSCREEN 1
+#endif
+
#ifdef X11_FULLSCREEN
#define vo_wm_LAYER 1