diff options
| author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2008-11-25 21:12:01 +0200 |
|---|---|---|
| committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2008-11-25 21:12:01 +0200 |
| commit | 835511ac394d5283c9c449e6154ccb0db1365321 (patch) | |
| tree | c223ee6b82481a0030273cfae9e831dada249fd8 /libvo/vo_xvmc.c | |
| parent | 6c712271ce9e8d4eb9cd615e920139ebcb1d1d49 (diff) | |
| parent | cc5e0406412a5f8b4e6e7094f6ffa18a65decd74 (diff) | |
| download | mpv-835511ac394d5283c9c449e6154ccb0db1365321.tar.bz2 mpv-835511ac394d5283c9c449e6154ccb0db1365321.tar.xz | |
Merge svn changes up to r28038
Diffstat (limited to 'libvo/vo_xvmc.c')
| -rw-r--r-- | libvo/vo_xvmc.c | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/libvo/vo_xvmc.c b/libvo/vo_xvmc.c index 5a13d0e71a..89fb2e6fe8 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 @@ -1033,9 +1029,6 @@ int i,cfs; } static void check_events(void){ -Window mRoot; -uint32_t drwBorderWidth,drwDepth; - int e=vo_x11_check_events(mDisplay); if(e&VO_EVENT_RESIZE) { |