[MPlayer-cvslog] CVS: main/libvo geometry.c,1.13,1.14
Alexander Strasser beastd
syncmail at mplayerhq.hu
Wed Feb 9 18:58:43 CET 2005
CVS change done by Alexander Strasser (beastd)
Update of /cvsroot/mplayer/main/libvo
In directory mail:/var2/tmp/cvs-serv12129/libvo
Modified Files:
geometry.c
Log Message:
Fix the behaviour of -geometry according to the documentation.
Patch by Bjorn Danielsson <mplayer-mail ta dax tod nu>
Index: geometry.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/geometry.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- geometry.c 28 Oct 2004 01:15:52 -0000 1.13
+++ geometry.c 9 Feb 2005 17:58:41 -0000 1.14
@@ -31,20 +31,21 @@
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);
More information about the MPlayer-cvslog
mailing list