[MPlayer-cvslog] r27986 - in trunk/libvo: vo_xv.c vo_xvmc.c

[reimar]

Author: reimar
Date: Sun Nov 23 13:30:39 2008
New Revision: 27986

Log:
Simplify handling of VOFLAG_MODESWITCHNG, merge assignment and declaration


Modified:
   trunk/libvo/vo_xv.c
   trunk/libvo/vo_xvmc.c

Modified: trunk/libvo/vo_xv.c
==============================================================================
--- trunk/libvo/vo_xv.c	(original)
+++ trunk/libvo/vo_xv.c	Sun Nov 23 13:30:39 2008
@@ -171,7 +171,7 @@ static int config(uint32_t width, uint32
     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
     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;
 

Modified: trunk/libvo/vo_xvmc.c
==============================================================================
--- trunk/libvo/vo_xvmc.c	(original)
+++ trunk/libvo/vo_xvmc.c	Sun Nov 23 13:30:39 2008
@@ -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