Mercurial > mplayer.hg

changeset 30450:201c9a709547

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Remove pointless initializers and also set geometry_*_changed to 0 when -geometry did not adjust some values (instead of only ever setting them to 1 and never reset them).
author reimar
date Tue, 02 Feb 2010 21:18:21 +0000
parents 3d45b1fdf829
children 99f339fb2fab
files libvo/geometry.c
diffstat 1 files changed, 5 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/libvo/geometry.c	Tue Feb 02 20:43:20 2010 +0000
+++ b/libvo/geometry.c	Tue Feb 02 21:18:21 2010 +0000
@@ -25,10 +25,10 @@
 #include "mp_msg.h"
 
 /* A string of the form [WxH][+X+Y] or xpos[%]:ypos[%] */
-char *vo_geometry = NULL;
+char *vo_geometry;
 // set when either width or height is changed
-int geometry_wh_changed = 0;
-int geometry_xy_changed = 0;
+int geometry_wh_changed;
+int geometry_xy_changed;
 
 #define RESET_GEOMETRY width = height = xoff = yoff = xper = yper = INT_MIN;
 
@@ -96,10 +96,8 @@
 		if (width  > 0 && widw) *widw = width;
 		if (height > 0 && widh) *widh = height;
 
-		if (width > 0 || height > 0)
-		    geometry_wh_changed = 1;
-		if (xoff != INT_MIN || yoff != INT_MIN)
-		    geometry_xy_changed = 1;
+		geometry_wh_changed = width > 0 || height > 0;
+		geometry_xy_changed = xoff != INT_MIN || yoff != INT_MIN;
         }
 	return 1;
 }