1
0
mirror of https://github.com/mpv-player/mpv synced 2024-12-18 12:55:16 +00:00

Simplify handling of VOFLAG_MODESWITCHNG, merge assignment and declaration

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27986 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
reimar 2008-11-23 12:30:39 +00:00
parent be6e3bf79f
commit 9542118efe
2 changed files with 2 additions and 10 deletions

View File

@ -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;

View File

@ -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