use the _x_abort() macro instead of abort, since it prints some debug info

before aborting

CVS patchset: 6211
CVS date: 2004/03/03 20:09:11

9 files changed, 32 insertions, 31 deletions

diff --git a/src/video_out/alphablend.c b/src/video_out/alphablend.c
index cbedf3ec8..a0541304b 100644
--- a/src/video_out/alphablend.c
+++ b/src/video_out/alphablend.c
@@ -3,6 +3,7 @@
  * Copyright (C) James Courtier-Dutton James@superbug.demon.co.uk - July 2001
  * 
  * Copyright (C) 2000  Thomas Mirlacher
+ *               2002-2004 the xine project
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -462,7 +463,7 @@ void blend_rgb16 (uint8_t * img, vo_overlay_t * img_overl,
       }
       break;
     case 6:  /* Finished */
-      abort();
+      _x_abort();
 
     case 7:  /* No button */
       clut = (clut_t*) img_overl->color;
diff --git a/src/video_out/video_out_aa.c b/src/video_out/video_out_aa.c
index 98b4059fd..1110c46ad 100644
--- a/src/video_out/video_out_aa.c
+++ b/src/video_out/video_out_aa.c
@@ -1,5 +1,5 @@
 /* 
- * Copyright (C) 2000-2003 the xine project
+ * Copyright (C) 2000-2004 the xine project
  * 
  * This file is part of xine, a free video player.
  * 
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA
  *
- * $Id: video_out_aa.c,v 1.42 2003/12/14 22:13:25 siggi Exp $
+ * $Id: video_out_aa.c,v 1.43 2004/03/03 20:09:15 mroi Exp $
  *
  * video_out_aa.c, ascii-art output plugin for xine
  *
@@ -167,7 +167,7 @@ static void aa_update_frame_format (vo_driver_t *this_gen, vo_frame_t *img,
       frame->vo_frame.base[0] = xine_xmalloc_aligned(16, frame->vo_frame.pitches[0] * height, (void**) &frame->mem[0]);
     } else {
       xprintf (this->xine, XINE_VERBOSITY_DEBUG, "alert! unsupported image format %04x\n", format);
-      abort();
+      _x_abort();
     }
 
     frame->ratio = ratio;
diff --git a/src/video_out/video_out_caca.c b/src/video_out/video_out_caca.c
index c53d48548..dc11fdda1 100644
--- a/src/video_out/video_out_caca.c
+++ b/src/video_out/video_out_caca.c
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA
  *
- * $Id: video_out_caca.c,v 1.1 2004/02/28 19:56:42 valtri Exp $
+ * $Id: video_out_caca.c,v 1.2 2004/03/03 20:09:15 mroi Exp $
  *
  * video_out_caca.c, Color AsCii Art output plugin for xine
  *
@@ -198,7 +198,7 @@ static void caca_update_frame_format (vo_driver_t *this_gen, vo_frame_t *img,
         width, height, width * 4);
     } else {
       xprintf (this->xine, XINE_VERBOSITY_DEBUG, "alert! unsupported image format %04x\n", format);
-      abort();
+      _x_abort();
     }
   }
 }
diff --git a/src/video_out/video_out_opengl.c b/src/video_out/video_out_opengl.c
index d56ac03ed..ceb96cad3 100644
--- a/src/video_out/video_out_opengl.c
+++ b/src/video_out/video_out_opengl.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2000-2003 the xine project
+ * Copyright (C) 2000-2004 the xine project
  * 
  * This file is part of xine, a free video player.
  * 
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA
  *
- * $Id: video_out_opengl.c,v 1.35 2003/12/14 22:13:25 siggi Exp $
+ * $Id: video_out_opengl.c,v 1.36 2004/03/03 20:09:15 mroi Exp $
  * 
  * video_out_glut.c, glut based OpenGL rendering interface for xine
  * Matthias Hopf <mat@mshopf.de>
@@ -591,7 +591,7 @@ static void opengl_render_image (opengl_driver_t *this, opengl_frame_t *frame,
 	    xprintf (this->xine, XINE_VERBOSITY_DEBUG,
 		     "video_out_opengl: no OpenGL support available (glXMakeCurrent)\n"
 		     "    The drawable does not seem to be updated correctly.\n");
-	    abort();
+	    _x_abort();
 	}
 	DEBUGF ((stderr, "set context done\n"));
 	if (ctx == this->context)
diff --git a/src/video_out/video_out_pgx32.c b/src/video_out/video_out_pgx32.c
index 7ac66f41f..f87894788 100644
--- a/src/video_out/video_out_pgx32.c
+++ b/src/video_out/video_out_pgx32.c
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
  *
- * $Id: video_out_pgx32.c,v 1.1 2004/02/17 19:44:02 komadori Exp $
+ * $Id: video_out_pgx32.c,v 1.2 2004/03/03 20:09:15 mroi Exp $
  *
  * video_out_pgx32.c, Sun PGX32 output plugin for xine
  *
@@ -389,7 +389,7 @@ static void pgx32_update_frame_format(vo_driver_t *this_gen, vo_frame_t *frame_g
     frame->packedlen = frame->pitch * 2 * height;
     if (!(frame->packedbuf = memalign(8, frame->packedlen))) {
       xprintf(this->class->xine, XINE_VERBOSITY_DEBUG, "video_out_pgx32: frame packed buffer malloc failed\n");
-      abort();
+      _x_abort();
     }
 
     planes = 0;
@@ -415,7 +415,7 @@ static void pgx32_update_frame_format(vo_driver_t *this_gen, vo_frame_t *frame_g
     for (i=0;i<planes;i++) {
       if (!frame->vo_frame.base[i]) {
         xprintf(this->class->xine, XINE_VERBOSITY_DEBUG, "video_out_pgx32: frame plane malloc failed\n");
-        abort();
+        _x_abort();
       }
     }
   }
diff --git a/src/video_out/video_out_pgx64.c b/src/video_out/video_out_pgx64.c
index 1d38ca062..640d14667 100644
--- a/src/video_out/video_out_pgx64.c
+++ b/src/video_out/video_out_pgx64.c
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
  *
- * $Id: video_out_pgx64.c,v 1.52 2004/02/17 19:44:02 komadori Exp $
+ * $Id: video_out_pgx64.c,v 1.53 2004/03/03 20:09:15 mroi Exp $
  *
  * video_out_pgx64.c, Sun PGX64/PGX24 output plugin for xine
  *
@@ -398,7 +398,7 @@ static void pgx64_update_frame_format(vo_driver_t *this_gen, vo_frame_t *frame_g
     for (i=0;i<frame->planes;i++) {
       if (!frame->vo_frame.base[i]) {
         xprintf(this->class->xine, XINE_VERBOSITY_DEBUG, "video_out_pgx64: frame plane malloc failed\n");
-        abort();
+        _x_abort();
       }
     }
   }
diff --git a/src/video_out/video_out_xv.c b/src/video_out/video_out_xv.c
index a12b912b0..a99bfed68 100644
--- a/src/video_out/video_out_xv.c
+++ b/src/video_out/video_out_xv.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2000-2003 the xine project
+ * Copyright (C) 2000-2004 the xine project
  *
  * This file is part of xine, a free video player.
  *
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA
  *
- * $Id: video_out_xv.c,v 1.190 2004/02/28 15:09:01 tmattern Exp $
+ * $Id: video_out_xv.c,v 1.191 2004/03/03 20:09:15 mroi Exp $
  *
  * video_out_xv.c, X11 video extension interface for xine
  *
@@ -261,7 +261,7 @@ static XvImage *create_ximage (xv_driver_t *this, XShmSegmentInfo *shminfo,
     break;
   default:
     xprintf (this->xine, XINE_VERBOSITY_DEBUG, "create_ximage: unknown format %08x\n",format);
-    abort();
+    _x_abort();
   }
 
   if (this->use_shm) {
@@ -367,7 +367,7 @@ static XvImage *create_ximage (xv_driver_t *this, XShmSegmentInfo *shminfo,
       break;
     default:
       xprintf (this->xine, XINE_VERBOSITY_DEBUG, "create_ximage: unknown format %08x\n",format);
-      abort();
+      _x_abort();
     }
 
     image = XvCreateImage (this->display, this->xv_port,
diff --git a/src/video_out/video_out_xvmc.c b/src/video_out/video_out_xvmc.c
index 3aaac0f06..8ead3549e 100644
--- a/src/video_out/video_out_xvmc.c
+++ b/src/video_out/video_out_xvmc.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2000-2003 the xine project
+ * Copyright (C) 2000-2004 the xine project
  *
  * This file is part of xine, a free video player.
  *
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA
  *
- * $Id: video_out_xvmc.c,v 1.13 2003/12/14 22:13:26 siggi Exp $
+ * $Id: video_out_xvmc.c,v 1.14 2004/03/03 20:09:15 mroi Exp $
  * 
  * video_out_xvmc.c, X11 video motion compensation extension interface for xine
  *
@@ -661,7 +661,7 @@ static cxid_t *xvmc_set_context (xvmc_driver_t *this,
     if(result != Success) {
       xprintf(this->xine, XINE_VERBOSITY_DEBUG, "set_context: couldn't create XvMCContext\n");
       macroblocks->xine_mc.xvmc_accel = 0;
-      abort();
+      _x_abort();
     }
 
     this->context_id.xid = (void *)this->context.context_id;
@@ -674,7 +674,7 @@ static cxid_t *xvmc_set_context (xvmc_driver_t *this,
 	xprintf(this->xine, XINE_VERBOSITY_DEBUG, "set_context: couldn't create XvMCSurfaces\n");
 	this->context_id.xid            = NULL;
 	macroblocks->xine_mc.xvmc_accel = 0;
-	abort();
+	_x_abort();
       }
 
       lprintf ("  CreatedSurface %d 0x%lx\n",i,(long)&this->frames[i]->surface);
@@ -689,14 +689,14 @@ static cxid_t *xvmc_set_context (xvmc_driver_t *this,
     if(result != Success) {
       xprintf(this->xine, XINE_VERBOSITY_DEBUG, "set_context: ERROR XvMCCreateBlocks failed\n");
       macroblocks->xine_mc.xvmc_accel = 0;
-      abort();
+      _x_abort();
     }
     result =XvMCCreateMacroBlocks(this->display, &this->context, slices,
 				  macroblocks->macro_blocks);
     if(result != Success) {
       xprintf(this->xine, XINE_VERBOSITY_DEBUG, "set_context: ERROR XvMCCreateMacroBlocks failed\n");
       macroblocks->xine_mc.xvmc_accel = 0;
-      abort();
+      _x_abort();
     }
 
     lprintf ("  Created bock and macro block arrays\n");
@@ -732,7 +732,7 @@ static XvImage *create_ximage (xvmc_driver_t *this, XShmSegmentInfo *shminfo,
     break;
   default:
     xprintf (this->xine, XINE_VERBOSITY_DEBUG, "create_ximage: unknown format %08x\n",format);
-    abort();
+    _x_abort();
   }
 
   /*
@@ -752,7 +752,7 @@ static XvImage *create_ximage (xvmc_driver_t *this, XShmSegmentInfo *shminfo,
       break;
     default:
       xprintf (this->xine, XINE_VERBOSITY_DEBUG, "create_ximage: unknown format %08x\n",format);
-      abort();
+      _x_abort();
     }
 
     image = XvCreateImage (this->display, this->xv_port,
diff --git a/src/video_out/yuv2rgb.c b/src/video_out/yuv2rgb.c
index d959f7a8d..564b7f254 100644
--- a/src/video_out/yuv2rgb.c
+++ b/src/video_out/yuv2rgb.c
@@ -1,7 +1,7 @@
 /*
  * yuv2rgb.c
  *
- * Copyright (C) 2003 the xine project
+ * Copyright (C) 2003-2004 the xine project
  * This file is part of xine, a free video player.
  *
  * based on work from mpeg2dec:
@@ -23,7 +23,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- * $Id: yuv2rgb.c,v 1.49 2004/02/19 02:50:26 rockyb Exp $
+ * $Id: yuv2rgb.c,v 1.50 2004/03/03 20:09:15 mroi Exp $
  */
 
 #include "config.h"
@@ -2398,7 +2398,7 @@ static void yuv2rgb_set_csc_levels (yuv2rgb_factory_t *this,
 
   default:
     lprintf ("mode %d not supported by yuv2rgb\n", mode);
-    abort();
+    _x_abort();
   }
   
   for (i = 0; i < 256; i++) {
@@ -2530,7 +2530,7 @@ static void yuv2rgb_c_init (yuv2rgb_factory_t *this)
 
   default:
     lprintf ("mode %d not supported by yuv2rgb\n", this->mode);
-    abort();
+    _x_abort();
   }
 
 }
@@ -2573,7 +2573,7 @@ static void yuv2rgb_single_pixel_init (yuv2rgb_factory_t *this) {
 
   default:
     lprintf ("mode %d not supported by yuv2rgb\n", this->mode);
-    abort();
+    _x_abort();
   }
 }