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_dxr3.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_dxr3.c')
| -rw-r--r-- | libvo/vo_dxr3.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/libvo/vo_dxr3.c b/libvo/vo_dxr3.c index 2e8e7cedc5..982a8eb265 100644 --- a/libvo/vo_dxr3.c +++ b/libvo/vo_dxr3.c @@ -32,7 +32,7 @@ #include "aspect.h" #include "spuenc.h" #include "sub.h" -#ifdef HAVE_NEW_GUI +#ifdef CONFIG_GUI #include "gui/interface.h" #endif #ifdef HAVE_X11 @@ -476,7 +476,7 @@ static int config(uint32_t width, uint32_t height, uint32_t d_width, uint32_t d_ vo_dy = (vo_screenheight - d_height) / 2; vo_dwidth = d_width; vo_dheight = d_height; -#ifdef HAVE_NEW_GUI +#ifdef CONFIG_GUI if (use_gui) { guiGetEvent(guiSetShVideo, 0); XSetWindowBackground(mDisplay, vo_window, KEY_COLOR); @@ -693,12 +693,12 @@ static void uninit(void) overlay_set_mode(overlay_data, EM8300_OVERLAY_MODE_OFF); overlay_release(overlay_data); -#ifdef HAVE_NEW_GUI +#ifdef CONFIG_GUI if (!use_gui) { #endif vo_x11_uninit(); -#ifdef HAVE_NEW_GUI +#ifdef CONFIG_GUI } #endif } @@ -875,14 +875,14 @@ static int preinit(const char *arg) /* Initialize overlay and X11 */ overlay_data = overlay_init(fd_control); -#ifdef HAVE_NEW_GUI +#ifdef CONFIG_GUI if (!use_gui) { #endif if (!vo_init()) { mp_msg(MSGT_VO,MSGL_ERR, MSGTR_LIBVO_DXR3_UnableToInitX11); return -1; } -#ifdef HAVE_NEW_GUI +#ifdef CONFIG_GUI } #endif } |