RepoMirrors
/
mpv
mirror of https://github.com/mpv-player/mpv
1
0
Fork 0
Code Issues Releases Wiki Activity

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).


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30492 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
reimar 2010-02-02 21:18:21 +00:00
parent c5fea2a0e3
commit 75bfddd3a2
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
libvo/geometry.c
View File

@ -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 @@ int geometry(int *xpos, int *ypos, int *widw, int *widh, int scrw, int scrh)
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;
}