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_xv.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_xv.c')
| -rw-r--r-- | libvo/vo_xv.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libvo/vo_xv.c b/libvo/vo_xv.c index b7082ed44c..6dfd8a8cf4 100644 --- a/libvo/vo_xv.c +++ b/libvo/vo_xv.c @@ -231,7 +231,7 @@ static int config(struct vo *vo, uint32_t width, uint32_t height, hint.y = vo->dy; hint.width = d_width; hint.height = d_height; -#ifdef HAVE_XF86VM +#ifdef CONFIG_XF86VM unsigned int modeline_width, modeline_height; uint32_t vm_width; uint32_t vm_height; @@ -313,7 +313,7 @@ static int config(struct vo *vo, uint32_t width, uint32_t height, XFreeGC(x11->display, x11->vo_gc); x11->vo_gc = XCreateGC(x11->display, x11->window, 0L, &xgcv); XSync(x11->display, False); -#ifdef HAVE_XF86VM +#ifdef CONFIG_XF86VM if (vm) { /* Grab the mouse pointer in our window */ @@ -708,7 +708,7 @@ static void uninit(struct vo *vo) } for (i = 0; i < ctx->num_buffers; i++) deallocate_xvimage(vo, i); -#ifdef HAVE_XF86VM +#ifdef CONFIG_XF86VM if (ctx->mode_switched) vo_vm_close(vo); #endif |