Mercurial > mplayer.hg

changeset 27880:a28ca0971d9a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Cosmetic changes to vo_x11 to reduce diff to vo_xv for future refactoring.
author reimar
date Sat, 15 Nov 2008 15:50:47 +0000
parents 514afc9b920e
children 573ee864ce9a
files libvo/vo_x11.c
diffstat 1 files changed, 4 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/libvo/vo_x11.c	Sat Nov 15 14:24:32 2008 +0000
+++ b/libvo/vo_x11.c	Sat Nov 15 15:50:47 2008 +0000
@@ -304,7 +304,6 @@
 {
 // int screen;
     int fullscreen = 0;
-    int vm = 0;
 
 // int interval, prefer_blank, allow_exp, nothing;
     unsigned int fg, bg;
@@ -315,6 +314,7 @@
     const struct fmt2Xfmtentry_s *fmte = fmt2Xfmt;
 
 #ifdef CONFIG_XF86VM
+    int vm = 0;
     unsigned int modeline_width, modeline_height;
     static uint32_t vm_width;
     static uint32_t vm_height;
@@ -324,6 +324,7 @@
     old_vo_dwidth = -1;
     old_vo_dheight = -1;
 
+    int_pause = 0;
     if (!title)
         title = "MPlayer X11 (XImage/Shm) render";
 
@@ -333,13 +334,14 @@
 
     if (flags & (VOFLAG_FULLSCREEN|VOFLAG_MODESWITCHING))
         fullscreen = 1;
+#ifdef CONFIG_XF86VM
     if (flags & VOFLAG_MODESWITCHING)
         vm = 1;
+#endif
     if (flags & VOFLAG_FLIPPING)
         Flip_Flag = 1;
     zoomFlag = flags & VOFLAG_SWSCALE;
 
-    int_pause = 0;
 // if(!fullscreen) zoomFlag=1; //it makes no sense to avoid zooming on windowd mode
 
 //printf( "w: %d h: %d\n\n",vo_dwidth,vo_dheight );