summaryrefslogtreecommitdiffstats
path: root/libvo/geometry.c
diff options
context:
space:
mode:
authoralex <alex@b3059339-0415-0410-9bf9-f77b7e298cf2>2003-08-31 18:33:02 +0000
committeralex <alex@b3059339-0415-0410-9bf9-f77b7e298cf2>2003-08-31 18:33:02 +0000
commit1450231f23142e0980f7bf5beb96a94fd3b38e2d (patch)
tree832f16a2a8e03270e097888c23bfa9fe59353ea1 /libvo/geometry.c
parent3eec29218ff104749db93dc8da4d22086a5d913f (diff)
downloadmpv-1450231f23142e0980f7bf5beb96a94fd3b38e2d.tar.bz2
mpv-1450231f23142e0980f7bf5beb96a94fd3b38e2d.tar.xz
remove exit_player and exit references
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@10735 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libvo/geometry.c')
-rw-r--r--libvo/geometry.c14
1 files changed, 5 insertions, 9 deletions
diff --git a/libvo/geometry.c b/libvo/geometry.c
index f0b158a9e0..8c24d7b6cb 100644
--- a/libvo/geometry.c
+++ b/libvo/geometry.c
@@ -4,18 +4,10 @@
#include <string.h>
#include "geometry.h"
#include "../mp_msg.h"
-#include "../mplayer.h" /* exit_player() */
/* A string of the form [WxH][+X+Y] or xpos[%]:ypos[%] */
char *vo_geometry = NULL;
-int geometry_error()
-{
- mp_msg(MSGT_VO, MSGL_ERR, "-geometry must be in [WxH][+X+Y] | [X[%%]:[Y[%%]]] format, incorrect (%s)\n", vo_geometry);
- exit_player(NULL); /* ????? what else could we do ? */
- return 0;
-}
-
#define RESET_GEOMETRY width = height = xoff = yoff = xper = yper = -1;
// xpos,ypos: position of the left upper corner
@@ -50,7 +42,11 @@ int geometry(int *xpos, int *ypos, int *widw, int *widh, int scrw, int scrh)
{
RESET_GEOMETRY
if(sscanf(vo_geometry, "%i%%", &xper) != 1)
- return geometry_error();
+ {
+ mp_msg(MSGT_VO, MSGL_ERR,
+ "-geometry must be in [WxH][+X+Y] | [X[%%]:[Y[%%]]] format, incorrect (%s)\n", vo_geometry);
+ return 0;
+ }
}
}
}