remove exit_player and exit references

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@10735 b3059339-0415-0410-9bf9-f77b7e298cf2

3 files changed, 8 insertions, 13 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;
+		      }
 		     }
 		    }
 		   }
diff --git a/libvo/vo_vesa.c b/libvo/vo_vesa.c
index 8b68e38635..8b7ad638a3 100644
--- a/libvo/vo_vesa.c
+++ b/libvo/vo_vesa.c
@@ -185,7 +185,7 @@ static inline void __vbeSwitchBank(unsigned long offset)
     vesa_term();
     PRINT_VBE_ERR("vbeSetWindow",err);
     printf("vo_vesa: Fatal error occured! Can't continue\n");
-    exit(-1);
+    abort();
   }
   win.low = new_offset * gran;
   win.high = win.low + video_mode_info.WinSize*1024;
@@ -387,7 +387,7 @@ static void flip_page(void)
       vesa_term();
       PRINT_VBE_ERR("vbeSetDisplayStart",err);
       printf("vo_vesa: Fatal error occured! Can't continue\n");
-      exit(EXIT_FAILURE);
+      abort();
     }
     multi_idx = multi_idx ? 0 : 1;
     win.ptr = dga_buffer = video_base + multi_buff[multi_idx];
diff --git a/libvo/vo_xvidix.c b/libvo/vo_xvidix.c
index 30f135154c..281933dab4 100644
--- a/libvo/vo_xvidix.c
+++ b/libvo/vo_xvidix.c
@@ -32,7 +32,6 @@
 
 #include "vosub_vidix.h"
 #include "../vidix/vidixlib.h"
-#include "../mplayer.h" /* exit_player() */
 
 #ifdef HAVE_NEW_GUI
 #include "../Gui/interface.h"
@@ -188,7 +187,7 @@ static void set_window(int force_update)
 	    vo_screenwidth, vo_screenheight) != 0)
         {
 	    mp_msg(MSGT_VO, MSGL_FATAL, "Can't initialize VIDIX driver: %s\n", strerror(errno));
-    	    exit_player("vidix error"); /* !!! */
+    	    abort();
 	}
 	vidix_start();
     }