leeexin/Velix-MPV-Core
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix the behaviour of -geometry according to the documentation.

Browse Source 
Patch by Bjorn Danielsson <mplayer-mail ta dax tod nu>


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@14679 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
al committed 2005-02-09 17:58:41 +00:00
1 parent 034ff6cafc
commit d568eaa271
1 file changed
+6 -5
Download Patch File Download Diff File Expand all files Collapse all files
libvo/geometry.c
+6 -5
View File
@@ -31,20 +31,21 @@ int geometry(int *xpos, int *ypos, int *widw, int *widh, int scrw, int scrh)
RESET_GEOMETRY
if(sscanf(vo_geometry, "+%i+%i", &xoff, &yoff) != 2)
{
char percent[2];
RESET_GEOMETRY
if(sscanf(vo_geometry, "%i:%i", &xoff, &yoff) != 2)
if(sscanf(vo_geometry, "%i%%:%i%1[%]", &xper, &yper, &percent) != 3)
{
RESET_GEOMETRY
if(sscanf(vo_geometry, "%i:%i%%", &xper, &yper) != 2)
if(sscanf(vo_geometry, "%i:%i%1[%]", &xoff, &yper, &percent) != 3)
{
RESET_GEOMETRY
if(sscanf(vo_geometry, "%i%%:%i", &xper, &yper) != 2)
if(sscanf(vo_geometry, "%i%%:%i", &xper, &yoff) != 2)
{
RESET_GEOMETRY
if(sscanf(vo_geometry, "%i%%:%i%%", &xper, &yper) != 2)
if(sscanf(vo_geometry, "%i:%i", &xoff, &yoff) != 2)
{
RESET_GEOMETRY
if(sscanf(vo_geometry, "%i%%", &xper) != 1)
if(sscanf(vo_geometry, "%i%1[%]", &xper, &percent) != 2)
{
mp_msg(MSGT_VO, MSGL_ERR,
"-geometry must be in [WxH][+X+Y] | [X[%%]:[Y[%%]]] format, incorrect (%s)\n", vo_geometry);