diff options
author | reimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2008-11-15 18:56:25 +0000 |
---|---|---|
committer | reimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2008-11-15 18:56:25 +0000 |
commit | 4b9ee2e2063f8d0a56288cb9d1aa8b35e640600b (patch) | |
tree | b871040755c18ef882d0f8d0fcc46bcec7e31ba1 /libvo/vo_xvmc.c | |
parent | c8d9e2eb60e942009c35270b97045e84e74dd5d5 (diff) | |
download | mpv-4b9ee2e2063f8d0a56288cb9d1aa8b35e640600b.tar.bz2 mpv-4b9ee2e2063f8d0a56288cb9d1aa8b35e640600b.tar.xz |
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
Diffstat (limited to 'libvo/vo_xvmc.c')
-rw-r--r-- | libvo/vo_xvmc.c | 13 |
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(); } |