[MPlayer-cvslog] CVS: main/libvo geometry.c,1.14,1.15

[Dominik Mierzejewski CVS]

CVS change done by Dominik Mierzejewski CVS

Update of /cvsroot/mplayer/main/libvo
In directory mail:/var2/tmp/cvs-serv9436/libvo

Modified Files:
	geometry.c 
Log Message:
- fix gcc warnings, strlcat/strlcpy prototypes
- fix bad sscanf usage in geometry.c


Index: geometry.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/geometry.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- geometry.c	9 Feb 2005 17:58:41 -0000	1.14
+++ geometry.c	6 Apr 2005 11:57:09 -0000	1.15
@@ -33,10 +33,10 @@
 		  {
 		   char percent[2];
 		   RESET_GEOMETRY
-		   if(sscanf(vo_geometry, "%i%%:%i%1[%]", &xper, &yper, &percent) != 3)
+		   if(sscanf(vo_geometry, "%i%%:%i%1[%]", &xper, &yper, percent) != 3)
 		   {
 		    RESET_GEOMETRY
-		    if(sscanf(vo_geometry, "%i:%i%1[%]", &xoff, &yper, &percent) != 3)
+		    if(sscanf(vo_geometry, "%i:%i%1[%]", &xoff, &yper, percent) != 3)
 		    {
 		     RESET_GEOMETRY
 		     if(sscanf(vo_geometry, "%i%%:%i", &xper, &yoff) != 2)
@@ -45,7 +45,7 @@
 		     if(sscanf(vo_geometry, "%i:%i", &xoff, &yoff) != 2)
 		     {
 		      RESET_GEOMETRY
-		      if(sscanf(vo_geometry, "%i%1[%]", &xper, &percent) != 2)
+		      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);