summaryrefslogtreecommitdiffstats
path: root/libvo/vo_xvmc.c
diff options
context:
space:
mode:
authorreimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2>2008-11-23 12:30:39 +0000
committerreimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2>2008-11-23 12:30:39 +0000
commit9542118efe9ace06ae86a8485053d7249488a251 (patch)
tree519a6c4cfd8652f85790e3c8e68f7042886dd30e /libvo/vo_xvmc.c
parentbe6e3bf79ffa26827599bc68154ed1e065581b89 (diff)
downloadmpv-9542118efe9ace06ae86a8485053d7249488a251.tar.bz2
mpv-9542118efe9ace06ae86a8485053d7249488a251.tar.xz
Simplify handling of VOFLAG_MODESWITCHNG, merge assignment and declaration
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27986 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libvo/vo_xvmc.c')
-rw-r--r--libvo/vo_xvmc.c6
1 files changed, 1 insertions, 5 deletions
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