diff options
author | Uoti Urpala <uau@symbol.nonexistent.invalid> | 2008-08-02 22:04:35 +0300 |
---|---|---|
committer | Uoti Urpala <uau@symbol.nonexistent.invalid> | 2008-08-02 22:04:35 +0300 |
commit | 6cce822505c0a76ac520909a895021b8f5b7e5ab (patch) | |
tree | f8ba954c698470208a243be3da216f7f54367f46 /libvo/vo_xover.c | |
parent | 04f3909a724a06ca5a5a3921061f2ba9fb9d8787 (diff) | |
parent | ded7033671fb7d84fbdb67ace46c1fc8833631bc (diff) | |
download | mpv-6cce822505c0a76ac520909a895021b8f5b7e5ab.tar.bz2 mpv-6cce822505c0a76ac520909a895021b8f5b7e5ab.tar.xz |
Merge svn changes up to r27399
Conflicts:
libmpcodecs/vd.c
libmpcodecs/ve_raw.c
libvo/video_out.c
libvo/x11_common.c
mplayer.c
Diffstat (limited to 'libvo/vo_xover.c')
-rw-r--r-- | libvo/vo_xover.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libvo/vo_xover.c b/libvo/vo_xover.c index 04f51790e6..1a2f833913 100644 --- a/libvo/vo_xover.c +++ b/libvo/vo_xover.c @@ -32,7 +32,7 @@ #include "aspect.h" #include "mp_msg.h" -#ifdef HAVE_NEW_GUI +#ifdef CONFIG_GUI #include "gui/interface.h" #endif @@ -258,7 +258,7 @@ static int config(uint32_t width, uint32_t height, uint32_t d_width, vo_dy += xinerama_y; vo_dwidth=d_width; vo_dheight=d_height; -#ifdef HAVE_NEW_GUI +#ifdef CONFIG_GUI if(use_gui) guiGetEvent( guiSetShVideo,0 ); // the GUI will set up / resize the window else { @@ -308,7 +308,7 @@ static int config(uint32_t width, uint32_t height, uint32_t d_width, if ( vo_gc != None ) XFreeGC( mDisplay,vo_gc ); vo_gc = XCreateGC(mDisplay, vo_window, GCForeground, &mGCV); -#ifdef HAVE_NEW_GUI +#ifdef CONFIG_GUI } #endif |