summaryrefslogtreecommitdiffstats
path: root/libvo/vo_xv.c
diff options
context:
space:
mode:
authordiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2008-08-04 06:16:23 +0000
committerdiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2008-08-04 06:16:23 +0000
commit82f319af620ae1e9c8b983d37b038b591575493c (patch)
tree3d254bb15ef6cf0240246eccfea371ea5d33ccaf /libvo/vo_xv.c
parent2776119d831edac39c49094291d2ac11752512a2 (diff)
downloadmpv-82f319af620ae1e9c8b983d37b038b591575493c.tar.bz2
mpv-82f319af620ae1e9c8b983d37b038b591575493c.tar.xz
Change a bunch of X11-specific preprocessor directives.
Switch from a HAVE_ prefix to a CONFIG_ prefix. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27409 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libvo/vo_xv.c')
-rw-r--r--libvo/vo_xv.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/libvo/vo_xv.c b/libvo/vo_xv.c
index 2ccbc41f03..f84f99fb83 100644
--- a/libvo/vo_xv.c
+++ b/libvo/vo_xv.c
@@ -174,7 +174,7 @@ static int config(uint32_t width, uint32_t height, uint32_t d_width,
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;
@@ -198,7 +198,7 @@ static int config(uint32_t width, uint32_t height, uint32_t d_width,
int_pause = 0;
visible_buf = -1;
-#ifdef HAVE_XF86VM
+#ifdef CONFIG_XF86VM
if (flags & VOFLAG_MODESWITCHING)
vm = 1;
#endif
@@ -234,7 +234,7 @@ static int config(uint32_t width, uint32_t height, uint32_t d_width,
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))
@@ -308,7 +308,7 @@ static int config(uint32_t width, uint32_t height, uint32_t d_width,
XFreeGC(mDisplay, vo_gc);
vo_gc = XCreateGC(mDisplay, vo_window, 0L, &xgcv);
XSync(mDisplay, False);
-#ifdef HAVE_XF86VM
+#ifdef CONFIG_XF86VM
if (vm)
{
/* Grab the mouse pointer in our window */
@@ -710,7 +710,7 @@ static void uninit(void)
}
for (i = 0; i < num_buffers; i++)
deallocate_xvimage(i);
-#ifdef HAVE_XF86VM
+#ifdef CONFIG_XF86VM
vo_vm_close(mDisplay);
#endif
mp_input_rm_event_fd(ConnectionNumber(mDisplay));