Simplify vo_vm_switch and vo_vm_close, everyone was using the (almost) same

boiler-plate code with them, just with different bugs.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27924 b3059339-0415-0410-9bf9-f77b7e298cf2

1 files changed, 2 insertions, 11 deletions

diff --git a/libvo/vo_xvmc.c b/libvo/vo_xvmc.c
index 8e0fbbb15d..23ba186071 100644
--- a/libvo/vo_xvmc.c
+++ b/libvo/vo_xvmc.c
@@ -656,16 +656,7 @@ skip_surface_allocation:
 #ifdef CONFIG_XF86VM
       if ( vm )
       {
-	 if ((d_width==0) && (d_height==0))
-	    { vm_width=image_width; vm_height=image_height; }
-	 else
-	    { vm_width=d_width; vm_height=d_height; }
-	 vo_vm_switch(vm_width, vm_height,&modeline_width, &modeline_height);
-	 hint.x=(vo_screenwidth-modeline_width)/2;
-	 hint.y=(vo_screenheight-modeline_height)/2;
-	 hint.width=modeline_width;
-	 hint.height=modeline_height;
-	 aspect_save_screenres(modeline_width,modeline_height);
+	 vo_vm_switch();
       }
       else
 #endif
@@ -1152,7 +1143,7 @@ static void uninit(void){
    xvmc_free();
  //from vo_xv
 #ifdef CONFIG_XF86VM
-   vo_vm_close(mDisplay);
+   vo_vm_close();
 #endif
    vo_x11_uninit();
 }