summaryrefslogtreecommitdiffstats
path: root/libvo/vo_xvmc.c
diff options
context:
space:
mode:
authorUoti Urpala <uau@symbol.nonexistent.invalid>2008-08-08 02:04:43 +0300
committerUoti Urpala <uau@symbol.nonexistent.invalid>2008-08-08 02:13:09 +0300
commit17d3e4b36d18f4a653f7c5f6ea2f15fcd3a2f069 (patch)
tree5d1910a2ab6381f6b4fb0ffc2834f55f7fef7129 /libvo/vo_xvmc.c
parent2ba9df3df3d61a7cc1bde9f897bc77eaaf14b383 (diff)
parentaf76be6e197382af491fadef3fcf821a721c99f5 (diff)
downloadmpv-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_xvmc.c')
-rw-r--r--libvo/vo_xvmc.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/libvo/vo_xvmc.c b/libvo/vo_xvmc.c
index 56d57c16c2..749e4f4364 100644
--- a/libvo/vo_xvmc.c
+++ b/libvo/vo_xvmc.c
@@ -38,7 +38,7 @@
#include "libavutil/common.h"
//no chance for xinerama to be supported in the near future
-#undef HAVE_XINERAMA
+#undef CONFIG_XINERAMA
#undef NDEBUG
#include <assert.h>
@@ -463,7 +463,7 @@ XSetWindowAttributes xswa;
XWindowAttributes attribs;
unsigned long xswamask;
int depth;
-#ifdef HAVE_XF86VM
+#ifdef CONFIG_XF86VM
int vm=0;
unsigned int modeline_width, modeline_height;
static uint32_t vm_width;
@@ -641,7 +641,7 @@ skip_surface_allocation:
vo_mouse_autohide = 1;
-#ifdef HAVE_XF86VM
+#ifdef CONFIG_XF86VM
if( flags&VOFLAG_MODESWITCHING ) vm = 1;
#endif
@@ -655,7 +655,7 @@ skip_surface_allocation:
hint.y = vo_dy;
hint.width = d_width;
hint.height = d_height;
-#ifdef HAVE_XF86VM
+#ifdef CONFIG_XF86VM
if ( vm )
{
if ((d_width==0) && (d_height==0))
@@ -707,7 +707,7 @@ skip_surface_allocation:
if ( vo_gc != None ) XFreeGC( mDisplay,vo_gc );
vo_gc = XCreateGC(mDisplay, vo_window, GCForeground, &xgcv);
XSync(mDisplay, False);
-#ifdef HAVE_XF86VM
+#ifdef CONFIG_XF86VM
if ( vm )
{
/* Grab the mouse pointer in our window */
@@ -1153,7 +1153,7 @@ static void uninit(void){
printf("vo_xvmc: uninit called\n"); }
xvmc_free();
//from vo_xv
-#ifdef HAVE_XF86VM
+#ifdef CONFIG_XF86VM
vo_vm_close(mDisplay);
#endif
vo_x11_uninit();