diff options
author | Uoti Urpala <uau@symbol.nonexistent.invalid> | 2008-08-08 02:04:43 +0300 |
---|---|---|
committer | Uoti Urpala <uau@symbol.nonexistent.invalid> | 2008-08-08 02:13:09 +0300 |
commit | 17d3e4b36d18f4a653f7c5f6ea2f15fcd3a2f069 (patch) | |
tree | 5d1910a2ab6381f6b4fb0ffc2834f55f7fef7129 /libvo/vo_dxr3.c | |
parent | 2ba9df3df3d61a7cc1bde9f897bc77eaaf14b383 (diff) | |
parent | af76be6e197382af491fadef3fcf821a721c99f5 (diff) | |
download | mpv-17d3e4b36d18f4a653f7c5f6ea2f15fcd3a2f069.tar.bz2 mpv-17d3e4b36d18f4a653f7c5f6ea2f15fcd3a2f069.tar.xz |
Merge svn changes up to r27441
Conflicts:
cfg-common-opts.h
command.c
configure
input/input.c
libmpcodecs/dec_video.c
libmpcodecs/vd.c
libmpdemux/stheader.h
libvo/sub.c
libvo/video_out.c
libvo/vo_xv.c
libvo/vosub_vidix.c
libvo/x11_common.c
libvo/x11_common.h
mp_core.h
mplayer.c
stream/stream.h
Diffstat (limited to 'libvo/vo_dxr3.c')
-rw-r--r-- | libvo/vo_dxr3.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/libvo/vo_dxr3.c b/libvo/vo_dxr3.c index 982a8eb265..69038ae0eb 100644 --- a/libvo/vo_dxr3.c +++ b/libvo/vo_dxr3.c @@ -35,7 +35,7 @@ #ifdef CONFIG_GUI #include "gui/interface.h" #endif -#ifdef HAVE_X11 +#ifdef CONFIG_X11 #include "x11_common.h" #endif #include "libavutil/avstring.h" @@ -152,7 +152,7 @@ static int overlay_signalmode(overlay_t *o, int mode); /* End overlay.h */ -#ifdef HAVE_X11 +#ifdef CONFIG_X11 #define KEY_COLOR 0x80a040 static XWindowAttributes xwin_attribs; static overlay_t *overlay_data; @@ -178,7 +178,7 @@ static int control(uint32_t request, void *data) return VO_ERROR; } return VO_TRUE; -#ifdef HAVE_X11 +#ifdef CONFIG_X11 case VOCTRL_ONTOP: vo_x11_ontop(); return VO_TRUE; @@ -418,7 +418,7 @@ static int config(uint32_t width, uint32_t height, uint32_t d_width, uint32_t d_ ioctl(fd_control, EM8300_IOCTL_SET_ASPECTRATIO, &ioval); #ifdef SPU_SUPPORT -#ifdef HAVE_FREETYPE +#ifdef CONFIG_FREETYPE if (ioval == EM8300_ASPECTRATIO_16_9) { s_width *= d_height*1.78/s_height*(d_width*1.0/d_height)/2.35; } else { @@ -458,7 +458,7 @@ static int config(uint32_t width, uint32_t height, uint32_t d_width, uint32_t d_ #endif -#ifdef HAVE_X11 +#ifdef CONFIG_X11 if (dxr3_overlay) { XVisualInfo vinfo; XSetWindowAttributes xswa; @@ -634,7 +634,7 @@ static int draw_frame(uint8_t * src[]) static void flip_page(void) { -#ifdef HAVE_X11 +#ifdef CONFIG_X11 if (dxr3_overlay) { int event = vo_x11_check_events(mDisplay); if (event & VO_EVENT_RESIZE) { @@ -688,7 +688,7 @@ static int draw_slice(uint8_t *srcimg[], int stride[], int w, int h, int x0, int static void uninit(void) { mp_msg(MSGT_VO,MSGL_INFO, MSGTR_LIBVO_DXR3_Uninitializing); -#ifdef HAVE_X11 +#ifdef CONFIG_X11 if (dxr3_overlay) { overlay_set_mode(overlay_data, EM8300_OVERLAY_MODE_OFF); overlay_release(overlay_data); @@ -746,7 +746,7 @@ static int preinit(const char *arg) mp_msg(MSGT_VO,MSGL_INFO, MSGTR_LIBVO_DXR3_UsingNewSyncEngine); dxr3_newsync = 1; } else if (!strncmp("overlay", arg, 7) && !dxr3_overlay) { -#ifdef HAVE_X11 +#ifdef CONFIG_X11 mp_msg(MSGT_VO,MSGL_INFO, MSGTR_LIBVO_DXR3_UsingOverlay); dxr3_overlay = 1; #else @@ -846,7 +846,7 @@ static int preinit(const char *arg) } strcpy(fds_name, devname); -#ifdef HAVE_X11 +#ifdef CONFIG_X11 if (dxr3_overlay) { /* Fucked up hack needed to enable overlay. |