diff options
| author | reimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2008-11-23 12:30:39 +0000 |
|---|---|---|
| committer | reimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2008-11-23 12:30:39 +0000 |
| commit | 9542118efe9ace06ae86a8485053d7249488a251 (patch) | |
| tree | 519a6c4cfd8652f85790e3c8e68f7042886dd30e /libvo | |
| parent | be6e3bf79ffa26827599bc68154ed1e065581b89 (diff) | |
| download | mpv-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')
| -rw-r--r-- | libvo/vo_xv.c | 6 | ||||
| -rw-r--r-- | libvo/vo_xvmc.c | 6 |
2 files changed, 2 insertions, 10 deletions
diff --git a/libvo/vo_xv.c b/libvo/vo_xv.c index 1f1fc8cd2e..2c30bddb50 100644 --- a/libvo/vo_xv.c +++ b/libvo/vo_xv.c @@ -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; 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 |