Mercurial > mplayer.hg
comparison libvo/geometry.c @ 15058:f48dc20c9185
- fix gcc warnings, strlcat/strlcpy prototypes
- fix bad sscanf usage in geometry.c
author | rathann |
---|---|
date | Wed, 06 Apr 2005 11:57:10 +0000 |
parents | 58f061d12c83 |
children | d97a607821f1 |
comparison
equal
deleted
inserted
replaced
15057:719883aa0adf | 15058:f48dc20c9185 |
---|---|
31 RESET_GEOMETRY | 31 RESET_GEOMETRY |
32 if(sscanf(vo_geometry, "+%i+%i", &xoff, &yoff) != 2) | 32 if(sscanf(vo_geometry, "+%i+%i", &xoff, &yoff) != 2) |
33 { | 33 { |
34 char percent[2]; | 34 char percent[2]; |
35 RESET_GEOMETRY | 35 RESET_GEOMETRY |
36 if(sscanf(vo_geometry, "%i%%:%i%1[%]", &xper, &yper, &percent) != 3) | 36 if(sscanf(vo_geometry, "%i%%:%i%1[%]", &xper, &yper, percent) != 3) |
37 { | 37 { |
38 RESET_GEOMETRY | 38 RESET_GEOMETRY |
39 if(sscanf(vo_geometry, "%i:%i%1[%]", &xoff, &yper, &percent) != 3) | 39 if(sscanf(vo_geometry, "%i:%i%1[%]", &xoff, &yper, percent) != 3) |
40 { | 40 { |
41 RESET_GEOMETRY | 41 RESET_GEOMETRY |
42 if(sscanf(vo_geometry, "%i%%:%i", &xper, &yoff) != 2) | 42 if(sscanf(vo_geometry, "%i%%:%i", &xper, &yoff) != 2) |
43 { | 43 { |
44 RESET_GEOMETRY | 44 RESET_GEOMETRY |
45 if(sscanf(vo_geometry, "%i:%i", &xoff, &yoff) != 2) | 45 if(sscanf(vo_geometry, "%i:%i", &xoff, &yoff) != 2) |
46 { | 46 { |
47 RESET_GEOMETRY | 47 RESET_GEOMETRY |
48 if(sscanf(vo_geometry, "%i%1[%]", &xper, &percent) != 2) | 48 if(sscanf(vo_geometry, "%i%1[%]", &xper, percent) != 2) |
49 { | 49 { |
50 mp_msg(MSGT_VO, MSGL_ERR, | 50 mp_msg(MSGT_VO, MSGL_ERR, |
51 "-geometry must be in [WxH][+X+Y] | [X[%%]:[Y[%%]]] format, incorrect (%s)\n", vo_geometry); | 51 "-geometry must be in [WxH][+X+Y] | [X[%%]:[Y[%%]]] format, incorrect (%s)\n", vo_geometry); |
52 return 0; | 52 return 0; |
53 } | 53 } |