diff options
author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2008-10-25 05:12:34 +0300 |
---|---|---|
committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2008-10-25 05:12:34 +0300 |
commit | 030130942562bb7b84eeba53e0226abed5a63a4c (patch) | |
tree | 9b49208facf2801369c9d2d7b3e7af11fab36829 /libvo/x11_common.h | |
parent | 562d86d95cbba67cb58358f6fc334553a467dee7 (diff) | |
parent | 15a80092161a1cd305f8005c780c744416a5252b (diff) | |
download | mpv-030130942562bb7b84eeba53e0226abed5a63a4c.tar.bz2 mpv-030130942562bb7b84eeba53e0226abed5a63a4c.tar.xz |
Merge svn changes up to 27824
Conflicts:
cfg-common-opts.h
libmpcodecs/dec_video.c
libmpcodecs/vd.c
libvo/x11_common.h
mplayer.c
stream/cache2.c
Diffstat (limited to 'libvo/x11_common.h')
-rw-r--r-- | libvo/x11_common.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/libvo/x11_common.h b/libvo/x11_common.h index b3066b300a..70f1231a7d 100644 --- a/libvo/x11_common.h +++ b/libvo/x11_common.h @@ -4,6 +4,8 @@ #include <X11/Xlib.h> #include <X11/Xutil.h> +#include "config.h" + struct vo; struct vo_x11_state { @@ -58,6 +60,10 @@ struct vo_x11_state { Atom XAWM_DELETE_WINDOW; }; +#if defined(CONFIG_GL) || defined(CONFIG_X11) || defined(CONFIG_XV) +#define X11_FULLSCREEN 1 +#endif + #ifdef X11_FULLSCREEN #define vo_wm_LAYER 1 |