summaryrefslogtreecommitdiffstats
path: root/libvo
diff options
context:
space:
mode:
Diffstat (limited to 'libvo')
-rw-r--r--libvo/vo_xv.c6
-rw-r--r--libvo/vo_xvmc.c6
2 files changed, 2 insertions, 10 deletions
diff --git a/libvo/vo_xv.c b/libvo/vo_xv.c
index 1f1fc8cd2e..2c30bddb50 100644
--- a/libvo/vo_xv.c
+++ b/libvo/vo_xv.c
@@ -171,7 +171,7 @@ static int config(uint32_t width, uint32_t height, uint32_t d_width,
int depth;
#ifdef CONFIG_XF86VM
- int vm = 0;
+ int vm = flags & VOFLAG_MODESWITCHING;
#endif
image_height = height;
@@ -189,10 +189,6 @@ static int config(uint32_t width, uint32_t height, uint32_t d_width,
int_pause = 0;
visible_buf = -1;
-#ifdef CONFIG_XF86VM
- if (flags & VOFLAG_MODESWITCHING)
- vm = 1;
-#endif
num_buffers =
vo_doublebuffering ? (vo_directrendering ? NUM_BUFFERS : 2) : 1;
diff --git a/libvo/vo_xvmc.c b/libvo/vo_xvmc.c
index 3c34e3084f..1eead7bf94 100644
--- a/libvo/vo_xvmc.c
+++ b/libvo/vo_xvmc.c
@@ -460,7 +460,7 @@ XWindowAttributes attribs;
unsigned long xswamask;
int depth;
#ifdef CONFIG_XF86VM
-int vm=0;
+int vm = flags & VOFLAG_MODESWITCHING;
#endif
//end of vo_xv
@@ -632,10 +632,6 @@ found_subpic:
skip_surface_allocation:
-#ifdef CONFIG_XF86VM
- if( flags&VOFLAG_MODESWITCHING ) vm = 1;
-#endif
-
#ifdef CONFIG_GUI
if(use_gui)
guiGetEvent( guiSetShVideo,0 ); // let the GUI to setup/resize our window