Mercurial > mplayer.hg

changeset 29753:75f54a9e4160

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Move some variable initializations to the beginning of vo_x11_fullscreen(). Fixes the warnings: libvo/x11_common.c:1344: warning: 'h' may be used uninitialized in this function libvo/x11_common.c:1344: warning: 'w' may be used uninitialized in this function libvo/x11_common.c:1344: warning: 'y' may be used uninitialized in this function libvo/x11_common.c:1344: warning: 'x' may be used uninitialized in this function
author diego
date Sat, 24 Oct 2009 12:35:18 +0000
parents a1da895d9947
children 2fecfba6f36a
files libvo/x11_common.c
diffstat 1 files changed, 4 insertions(+), 9 deletions(-) [+]
line wrap: on
line diff
--- a/libvo/x11_common.c	Fri Oct 23 18:26:42 2009 +0000
+++ b/libvo/x11_common.c	Sat Oct 24 12:35:18 2009 +0000
@@ -1342,6 +1342,10 @@
 void vo_x11_fullscreen(void)
 {
     int x, y, w, h;
+    x = vo_old_x;
+    y = vo_old_y;
+    w = vo_old_width;
+    h = vo_old_height;
 
     if (WinID >= 0) {
         vo_fs = !vo_fs;
@@ -1352,15 +1356,6 @@
 
     if (vo_fs)
     {
-        // fs->win
-        if ( ! (vo_fs_type & vo_wm_FULLSCREEN) ) // not needed with EWMH fs
-        {
-            x = vo_old_x;
-            y = vo_old_y;
-            w = vo_old_width;
-            h = vo_old_height;
-	}
-
         vo_x11_ewmh_fullscreen(_NET_WM_STATE_REMOVE);   // removes fullscreen state if wm supports EWMH
         vo_fs = VO_FALSE;
     } else