summaryrefslogtreecommitdiffstats
path: root/libvo/geometry.c
diff options
context:
space:
mode:
authorarpi <arpi@b3059339-0415-0410-9bf9-f77b7e298cf2>2002-11-06 23:54:29 +0000
committerarpi <arpi@b3059339-0415-0410-9bf9-f77b7e298cf2>2002-11-06 23:54:29 +0000
commitf859d013a883bbba59901303f644fe281454a63d (patch)
treee71729f1990b98ab27a8672e92a656d622c5ab19 /libvo/geometry.c
parentd1d7c653674e32de3a4aa47ee4068c57b288adb7 (diff)
downloadmpv-f859d013a883bbba59901303f644fe281454a63d.tar.bz2
mpv-f859d013a883bbba59901303f644fe281454a63d.tar.xz
*HUGE* set of compiler warning fixes, unused variables removal
based on patch by Dominik Mierzejewski <dominik@rangers.eu.org> git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8124 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libvo/geometry.c')
-rw-r--r--libvo/geometry.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/libvo/geometry.c b/libvo/geometry.c
index 26afd69547..1823a7b4c2 100644
--- a/libvo/geometry.c
+++ b/libvo/geometry.c
@@ -2,7 +2,9 @@
#include "geometry.h"
#include "../mp_msg.h"
+// #include "../mplayer.h" /* exit_player() */
#include <string.h>
+#include <stdlib.h> /* strtol */
/* A string of the form xpos[%]:ypos[%] */
char *vo_geometry = NULL;
@@ -53,7 +55,7 @@ int geometry(int *xpos, int *ypos, int scrw, int scrh, int vidw, int vidh, int f
return geometry_error();
}
- if(*colpos != '\0')
+ if(*colpos != '\0') {
if(vo_geometry[glen - 1] == '%') {
if(!get_num(colpos + 1, &yper, vo_geometry + glen - 1))
return geometry_error();
@@ -61,6 +63,7 @@ int geometry(int *xpos, int *ypos, int scrw, int scrh, int vidw, int vidh, int f
if(!get_num(colpos + 1, ypos, vo_geometry + glen))
return geometry_error();
}
+ }
if(xper)
*xpos = (scrw - vidw) * ((float)xper / 100.0);