Mercurial > mplayer.hg
changeset 27750:2c11b155ff11
Move X11_FULLSCREEN definition to x11_common.h where it belongs.
config.h should only contain option definitions, no logic.
| author | diego |
|---|---|
| date | Thu, 16 Oct 2008 18:19:36 +0000 |
| parents | fe1ef9daa92e |
| children | d120b2951b37 |
| files | configure libvo/vo_dxr2.c libvo/x11_common.h |
| diffstat | 3 files changed, 6 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/configure Thu Oct 16 18:14:35 2008 +0000 +++ b/configure Thu Oct 16 18:19:36 2008 +0000 @@ -8607,9 +8607,6 @@ /* Define this if you have shm support */ $_def_shm -#if defined(CONFIG_GL) || defined(CONFIG_X11) || defined(CONFIG_XV) -#define X11_FULLSCREEN 1 -#endif /* FFmpeg */ /* Define this to enable image postprocessing in libavcodec */
--- a/libvo/vo_dxr2.c Thu Oct 16 18:14:35 2008 +0000 +++ b/libvo/vo_dxr2.c Thu Oct 16 18:19:36 2008 +0000 @@ -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>
--- a/libvo/x11_common.h Thu Oct 16 18:14:35 2008 +0000 +++ b/libvo/x11_common.h Thu Oct 16 18:19:36 2008 +0000 @@ -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