summaryrefslogtreecommitdiffstats
path: root/libvo
diff options
context:
space:
mode:
authordiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2009-10-24 12:35:18 +0000
committerdiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2009-10-24 12:35:18 +0000
commit3d264d7b55c91547afb7ea8b0fbbf0e5f4dd27f1 (patch)
tree9a1269609d4d71e5d8ce603423c3b0873d24500e /libvo
parentfbf26ecb14f7187a132e3d2cfab8c386475cd059 (diff)
downloadmpv-3d264d7b55c91547afb7ea8b0fbbf0e5f4dd27f1.tar.bz2
mpv-3d264d7b55c91547afb7ea8b0fbbf0e5f4dd27f1.tar.xz
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 git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29795 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libvo')
-rw-r--r--libvo/x11_common.c13
1 files changed, 4 insertions, 9 deletions
diff --git a/libvo/x11_common.c b/libvo/x11_common.c
index 485db9931c..cdb695290e 100644
--- a/libvo/x11_common.c
+++ b/libvo/x11_common.c
@@ -1342,6 +1342,10 @@ int vo_x11_update_geometry(void) {
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 @@ void vo_x11_fullscreen(void)
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