diff options
author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2009-07-07 02:56:01 +0300 |
---|---|---|
committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2009-07-07 02:56:01 +0300 |
commit | a2037a2effbd4622d0e8336245a9b14c3f886bde (patch) | |
tree | bd2face6dd36d2663197b23a33da9e9b2814f70c /libvo/geometry.c | |
parent | 0c2773a709276681575d2507aa60ee85c2d0b850 (diff) | |
parent | 43079c51daa8c12b0a44e5ad8022c979dd9e8336 (diff) | |
download | mpv-a2037a2effbd4622d0e8336245a9b14c3f886bde.tar.bz2 mpv-a2037a2effbd4622d0e8336245a9b14c3f886bde.tar.xz |
Merge svn changes up to r29412
Diffstat (limited to 'libvo/geometry.c')
-rw-r--r-- | libvo/geometry.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libvo/geometry.c b/libvo/geometry.c index 189c351fc5..e8f0826bf9 100644 --- a/libvo/geometry.c +++ b/libvo/geometry.c @@ -30,7 +30,7 @@ char *vo_geometry = NULL; int geometry_wh_changed = 0; int geometry_xy_changed = 0; -#define RESET_GEOMETRY width = height = xoff = yoff = xper = yper = -1; +#define RESET_GEOMETRY width = height = xoff = yoff = xper = yper = INT_MIN; // xpos,ypos: position of the left upper corner // widw,widh: width and height of the window @@ -39,7 +39,7 @@ int geometry(int *xpos, int *ypos, int *widw, int *widh, int scrw, int scrh) { int width, height, xoff, yoff, xper, yper; - width = height = xoff = yoff = xper = yper = INT_MIN; + RESET_GEOMETRY if(vo_geometry != NULL) { if(sscanf(vo_geometry, "%ix%i+%i+%i", &width, &height, &xoff, &yoff) != 4 ) |