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

35 files changed, 143 insertions, 142 deletions

diff --git a/src/audio_out/audio_alsa_out.c b/src/audio_out/audio_alsa_out.c
index 117f4bc6f..de10aa78d 100644
--- a/src/audio_out/audio_alsa_out.c
+++ b/src/audio_out/audio_alsa_out.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.
  * 
@@ -26,7 +26,7 @@
  * (c) 2001 James Courtier-Dutton <James@superbug.demon.co.uk>
  *
  * 
- * $Id: audio_alsa_out.c,v 1.125 2004/03/02 23:51:39 hadess Exp $
+ * $Id: audio_alsa_out.c,v 1.126 2004/03/03 20:09:11 mroi Exp $
  */
 
 #ifdef HAVE_CONFIG_H
@@ -723,7 +723,7 @@ static int ao_alsa_write(ao_driver_t *this_gen, int16_t *data, uint32_t count) {
       return 0;
       xprintf(this->class->xine, XINE_VERBOSITY_DEBUG,
 	      "audio_alsa_out: xrun: prepare error: %s", snd_strerror(res));
-      abort();
+      _x_abort();
     }
     state = snd_pcm_state(this->audio_fd);
 #ifdef LOG_DEBUG
@@ -767,7 +767,7 @@ static int ao_alsa_write(ao_driver_t *this_gen, int16_t *data, uint32_t count) {
         if ((res = snd_pcm_prepare(this->audio_fd))<0) {
           xprintf(this->class->xine, XINE_VERBOSITY_DEBUG,
 		  "audio_alsa_out: xrun: prepare error: %s", snd_strerror(res));
-	  abort();
+	  _x_abort();
         }
       }
     }
diff --git a/src/demuxers/demux_mpeg.c b/src/demuxers/demux_mpeg.c
index 644bc626d..f18083610 100644
--- a/src/demuxers/demux_mpeg.c
+++ b/src/demuxers/demux_mpeg.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.
  *
@@ -19,7 +19,7 @@
  */
 
 /*
- * $Id: demux_mpeg.c,v 1.134 2004/01/12 17:35:15 miguelfreitas Exp $
+ * $Id: demux_mpeg.c,v 1.135 2004/03/03 20:09:11 mroi Exp $
  *
  * demultiplexer for mpeg 1/2 program streams
  * reads streams of variable blocksizes
@@ -206,7 +206,7 @@ static uint32_t read_bytes (demux_mpeg_t *this, uint32_t n) {
     break;
   default:
     lprintf ("how how - something wrong in wonderland demux:read_bytes (%d)\n", n);
-    abort();
+    _x_abort();
   }
 
   return res;
diff --git a/src/dxr3/dxr3_spu_encoder.c b/src/dxr3/dxr3_spu_encoder.c
index f884655af..c3ebdca45 100644
--- a/src/dxr3/dxr3_spu_encoder.c
+++ b/src/dxr3/dxr3_spu_encoder.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: dxr3_spu_encoder.c,v 1.5 2003/12/09 00:02:29 f1rmb Exp $
+ * $Id: dxr3_spu_encoder.c,v 1.6 2004/03/03 20:09:12 mroi Exp $
  */
 
 #include <stdio.h>
@@ -467,7 +467,7 @@ static void write_rle(spu_encoder_t *this, int *offset, int *higher_nibble, int
     write_nibble(this, offset, higher_nibble, (length & 0xc) | color);
     return;
   }
-  abort();
+  _x_abort();
 }
 
 static void write_byte(spu_encoder_t *this, int *offset, uint8_t byte)
diff --git a/src/input/http_helper.c b/src/input/http_helper.c
index 730deccad..f58b6c8f4 100644
--- a/src/input/http_helper.c
+++ b/src/input/http_helper.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.
  *
@@ -19,7 +19,7 @@
  *
  * URL helper functions
  *
- * $Id: http_helper.c,v 1.1 2003/11/26 08:09:58 tmattern Exp $ 
+ * $Id: http_helper.c,v 1.2 2004/03/03 20:09:12 mroi Exp $ 
  */
 #include "xine_internal.h"
 #include "http_helper.h"
@@ -43,13 +43,13 @@ int _x_parse_url (char *url, char **proto, char** host, int *port,
   char   *end        = NULL;
   char   *strtol_err = NULL;
 
-  if (!url)      abort();
-  if (!proto)    abort();
-  if (!user)     abort();
-  if (!password) abort();
-  if (!host)     abort();
-  if (!port)     abort();
-  if (!uri)      abort();
+  if (!url)      _x_abort();
+  if (!proto)    _x_abort();
+  if (!user)     _x_abort();
+  if (!password) _x_abort();
+  if (!host)     _x_abort();
+  if (!port)     _x_abort();
+  if (!uri)      _x_abort();
 
   *proto    = NULL;
   *port     = 0;
diff --git a/src/input/input_pvr.c b/src/input/input_pvr.c
index 32a7aa632..fd2117a96 100644
--- a/src/input/input_pvr.c
+++ b/src/input/input_pvr.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2000-2003 the xine project
+ * Copyright (C) 2000-2004 the xine project
  * March 2003 - Miguel Freitas
  * This plugin was sponsored by 1Control
  *
@@ -38,7 +38,7 @@
  * usage: 
  *   xine pvr:/<prefix_to_tmp_files>\!<prefix_to_saved_files>\!<max_page_age>
  *
- * $Id: input_pvr.c,v 1.42 2004/02/16 20:19:09 uid86226 Exp $
+ * $Id: input_pvr.c,v 1.43 2004/03/03 20:09:12 mroi Exp $
  */
 
 /**************************************************************************
@@ -1425,7 +1425,7 @@ static int pvr_plugin_open (input_plugin_t *this_gen ) {
 			     NULL, pvr_loop, this)) != 0) {
     xprintf (this->stream->xine, XINE_VERBOSITY_DEBUG,
 	     "input_pvr: can't create new thread (%s)\n", strerror(err));
-    abort();
+    _x_abort();
   }
   
   return 1;
diff --git a/src/input/input_rtp.c b/src/input/input_rtp.c
index 7a32662d5..648942531 100644
--- a/src/input/input_rtp.c
+++ b/src/input/input_rtp.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.
  * 
@@ -601,7 +601,7 @@ static int rtp_plugin_open (input_plugin_t *this_gen ) {
   if ((err = pthread_create(&this->reader_thread, NULL, 
 		            input_plugin_read_loop, (void *)this)) != 0) {
     LOG_MSG(this->stream->xine, _("input_rtp: can't create new thread (%s)\n"), strerror(err));
-    abort();
+    _x_abort();
   }
   
   return 1;
diff --git a/src/input/libreal/asmrp.c b/src/input/libreal/asmrp.c
index c81247f66..4bdfd4d06 100644
--- a/src/input/libreal/asmrp.c
+++ b/src/input/libreal/asmrp.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2002-2003 the xine project
+ * Copyright (C) 2002-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: asmrp.c,v 1.6 2003/12/09 00:02:30 f1rmb Exp $
+ * $Id: asmrp.c,v 1.7 2004/03/03 20:09:13 mroi Exp $
  *
  * a parser for real's asm rules
  *
@@ -412,7 +412,7 @@ static int asmrp_operand (asmrp_t *p) {
     
     if (p->sym != ASMRP_SYM_ID) {
       printf ("error: identifier expected.\n");
-      abort();
+      _x_abort();
     }
 
     i = asmrp_find_id (p, p->str);
@@ -437,7 +437,7 @@ static int asmrp_operand (asmrp_t *p) {
 
     if (p->sym != ASMRP_SYM_RPAREN) {
       printf ("error: ) expected.\n");
-      abort();
+      _x_abort();
     }
 
     asmrp_get_sym (p);
@@ -445,7 +445,7 @@ static int asmrp_operand (asmrp_t *p) {
 
   default:
     lprintf ("syntax error, $ number or ( expected\n");
-    abort();
+    _x_abort();
   }
 
   lprintf ("operand done, =%d\n", ret);
@@ -536,20 +536,20 @@ static void asmrp_assignment (asmrp_t *p) {
 
   if (p->sym != ASMRP_SYM_ID) {
     printf ("error: identifier expected\n");
-    abort ();
+    _x_abort ();
   }
   asmrp_get_sym (p);
 
   if (p->sym != ASMRP_SYM_EQUALS) {
     printf ("error: = expected\n");
-    abort ();
+    _x_abort ();
   }
   asmrp_get_sym (p);
 
   if ( (p->sym != ASMRP_SYM_NUM) && (p->sym != ASMRP_SYM_STRING) 
        && (p->sym != ASMRP_SYM_ID)) {
     printf ("error: number or string expected\n");
-    abort ();
+    _x_abort ();
   }
   asmrp_get_sym (p);
 
@@ -591,7 +591,7 @@ static int asmrp_rule (asmrp_t *p) {
 
   if (p->sym != ASMRP_SYM_SEMICOLON) {
     printf ("semicolon expected.\n");
-    abort ();
+    _x_abort ();
   }
 
   asmrp_get_sym (p);
diff --git a/src/libdivx4/xine_decoder.c b/src/libdivx4/xine_decoder.c
index 7b9941ee9..5867a643b 100644
--- a/src/libdivx4/xine_decoder.c
+++ b/src/libdivx4/xine_decoder.c
@@ -1,5 +1,5 @@
 /* 
- * Copyright (C) 2001-2003 the xine project
+ * Copyright (C) 2001-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: xine_decoder.c,v 1.50 2004/02/09 22:13:54 jstembridge Exp $
+ * $Id: xine_decoder.c,v 1.51 2004/03/03 20:09:13 mroi Exp $
  *
  * xine decoder plugin using divx4
  *
@@ -77,7 +77,7 @@ void catch_sigsegv(int sig)
          "divx4: divx4_forceversion:1\n"
          "divx4: see xine-ui/doc/README.divx4 for details.\n"
          "divx4: fatal error; exiting.\n");
-  abort();
+  _x_abort();
 }
 #endif
 
diff --git a/src/libffmpeg/video_decoder.c b/src/libffmpeg/video_decoder.c
index 2111d4130..916bfc956 100644
--- a/src/libffmpeg/video_decoder.c
+++ b/src/libffmpeg/video_decoder.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_decoder.c,v 1.8 2004/02/14 20:32:12 jstembridge Exp $
+ * $Id: video_decoder.c,v 1.9 2004/03/03 20:09:13 mroi Exp $
  *
  * xine video decoder plugin using ffmpeg
  *
@@ -459,7 +459,7 @@ static void find_sequence_header (ff_video_decoder_t *this,
       if (!this->codec) {
         xprintf (this->stream->xine, XINE_VERBOSITY_LOG, 
                  _("avcodec_find_decoder (CODEC_ID_MPEG1VIDEO) failed.\n"));
-        abort();
+        _x_abort();
       }
 
       this->is_continous = 1;
diff --git a/src/libmpeg2new/xine_decoder.c b/src/libmpeg2new/xine_decoder.c
index c8503b8c5..3a972057d 100644
--- a/src/libmpeg2new/xine_decoder.c
+++ b/src/libmpeg2new/xine_decoder.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: xine_decoder.c,v 1.19 2004/01/12 17:35:17 miguelfreitas Exp $
+ * $Id: xine_decoder.c,v 1.20 2004/03/03 20:09:13 mroi Exp $
  *
  * stuff needed to turn libmpeg2 into a xine decoder plugin
  */
@@ -74,7 +74,7 @@ static void mpeg2_video_print_bad_state(uint32_t * img_state) {
       m++;
     }
   }
-  if (m > 3) abort();
+  if (m > 3) _x_abort();
   if (m == 0) printf("NO FRAMES\n");
 } 
 
@@ -206,7 +206,7 @@ static void mpeg2_video_decode_data (video_decoder_t *this_gen, buf_element_t *b
 #endif
         if (this->img_state[img->id] != 0) {
           printf ("libmpeg2:decode_data:get_frame id=%d BAD STATE:%d\n", img->id, this->img_state[img->id]);
-          abort();
+          _x_abort();
         }
 
         this->img_state[img->id] = 1;
@@ -235,7 +235,7 @@ static void mpeg2_video_decode_data (video_decoder_t *this_gen, buf_element_t *b
 #endif
           if (this->img_state[img->id] != 1) {
             printf ("libmpeg2:decode_data:draw_frame id=%d BAD STATE:%d\n", img->id, this->img_state[img->id]);
-            abort();
+            _x_abort();
           }
           if (this->img_state[img->id] == 1) {
             frame_skipping = img->draw (img, this->stream);
@@ -246,7 +246,7 @@ static void mpeg2_video_decode_data (video_decoder_t *this_gen, buf_element_t *b
         }
         if (info->discard_fbuf && !info->discard_fbuf->id) {
           printf ("libmpeg2:decode_data:BAD free_frame discard_fbuf=%p\n", info->discard_fbuf);
-          abort();
+          _x_abort();
         }
         if (info->discard_fbuf && info->discard_fbuf->id) {
           img = (vo_frame_t *) info->discard_fbuf->id;
@@ -255,7 +255,7 @@ static void mpeg2_video_decode_data (video_decoder_t *this_gen, buf_element_t *b
 #endif
           if (this->img_state[img->id] != 2) {
             printf ("libmpeg2:decode_data:free_frame id=%d BAD STATE:%d\n", img->id, this->img_state[img->id]);
-            abort();
+            _x_abort();
           }
           if (this->img_state[img->id] == 2) {
             img->free(img);
@@ -308,7 +308,7 @@ static void mpeg2_video_reset (video_decoder_t *this_gen) {
 
     if (this->img_state[img->id] != 1) {
       printf ("libmpeg2:decode_data:draw_frame id=%d BAD STATE:%d\n", img->id, this->img_state[img->id]);
-      abort();
+      _x_abort();
     }
     if (this->img_state[img->id] == 1) {
       frame_skipping = img->draw (img, this->stream);
@@ -319,13 +319,13 @@ static void mpeg2_video_reset (video_decoder_t *this_gen) {
 
   if (info->discard_fbuf && !info->discard_fbuf->id) {
     printf ("libmpeg2:decode_data:BAD free_frame discard_fbuf=%p\n", info->discard_fbuf);
-    abort();
+    _x_abort();
   }
   if (info->discard_fbuf && info->discard_fbuf->id) {
     img = (vo_frame_t *) info->discard_fbuf->id;
     if (this->img_state[img->id] != 2) {
       printf ("libmpeg2:decode_data:free_frame id=%d BAD STATE:%d\n", img->id, this->img_state[img->id]);
-      abort();
+      _x_abort();
     }
     if (this->img_state[img->id] == 2) {
       img->free(img);
@@ -339,7 +339,7 @@ static void mpeg2_video_reset (video_decoder_t *this_gen) {
 
     if (this->img_state[img->id] != 1) {
       printf ("libmpeg2:decode_data:draw_frame id=%d BAD STATE:%d\n", img->id, this->img_state[img->id]);
-      abort();
+      _x_abort();
     }
     if (this->img_state[img->id] == 1) {
       frame_skipping = img->draw (img, this->stream);
@@ -350,13 +350,13 @@ static void mpeg2_video_reset (video_decoder_t *this_gen) {
 
   if (info->discard_fbuf && !info->discard_fbuf->id) {
     printf ("libmpeg2:decode_data:BAD free_frame discard_fbuf=%p\n", info->discard_fbuf);
-    abort();
+    _x_abort();
   }
   if (info->discard_fbuf && info->discard_fbuf->id) {
     img = (vo_frame_t *) info->discard_fbuf->id;
     if (this->img_state[img->id] != 2) {
       printf ("libmpeg2:decode_data:free_frame id=%d BAD STATE:%d\n", img->id, this->img_state[img->id]);
-      abort();
+      _x_abort();
     }
     if (this->img_state[img->id] == 2) {
       img->free(img);
@@ -370,7 +370,7 @@ static void mpeg2_video_reset (video_decoder_t *this_gen) {
 
     if (this->img_state[img->id] != 1) {
       printf ("libmpeg2:decode_data:draw_frame id=%d BAD STATE:%d\n", img->id, this->img_state[img->id]);
-      abort();
+      _x_abort();
     }
     if (this->img_state[img->id] == 1) {
       frame_skipping = img->draw (img, this->stream);
@@ -381,13 +381,13 @@ static void mpeg2_video_reset (video_decoder_t *this_gen) {
 
   if (info->discard_fbuf && !info->discard_fbuf->id) {
     printf ("libmpeg2:decode_data:BAD free_frame discard_fbuf=%p\n", info->discard_fbuf);
-    abort();
+    _x_abort();
   }
   if (info->discard_fbuf && info->discard_fbuf->id) {
     img = (vo_frame_t *) info->discard_fbuf->id;
     if (this->img_state[img->id] != 2) {
       printf ("libmpeg2:decode_data:free_frame id=%d BAD STATE:%d\n", img->id, this->img_state[img->id]);
-      abort();
+      _x_abort();
     }
     if (this->img_state[img->id] == 2) {
       img->free(img);
diff --git a/src/libreal/xine_decoder.c b/src/libreal/xine_decoder.c
index 7369acb00..0938035a1 100644
--- a/src/libreal/xine_decoder.c
+++ b/src/libreal/xine_decoder.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: xine_decoder.c,v 1.66 2004/02/12 23:33:42 jstembridge Exp $
+ * $Id: xine_decoder.c,v 1.67 2004/03/03 20:09:14 mroi Exp $
  *
  * thin layer to use real binary-only codecs in xine
  *
@@ -170,7 +170,7 @@ static int init_codec (realdec_decoder_t *this, buf_element_t *buf) {
   default:
     xprintf (this->stream->xine, XINE_VERBOSITY_DEBUG, 
 	     "libreal: error, i don't handle buf type 0x%08x\n", buf->type);
-    abort();
+    _x_abort();
   }
 
   init_data.w = BE_16(&buf->content[12]);
diff --git a/src/libspudec/xine_decoder.c b/src/libspudec/xine_decoder.c
index 8711479b8..0da9a701c 100644
--- a/src/libspudec/xine_decoder.c
+++ b/src/libspudec/xine_decoder.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2000-2003 the xine project
+ * Copyright (C) 2000-2004 the xine project
  * 
  * Copyright (C) James Courtier-Dutton James@superbug.demon.co.uk - July 2001
  *
@@ -19,7 +19,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: xine_decoder.c,v 1.104 2003/12/14 22:13:24 siggi Exp $
+ * $Id: xine_decoder.c,v 1.105 2004/03/03 20:09:14 mroi Exp $
  *
  * stuff needed to turn libspu into a xine decoder plugin
  */
@@ -274,7 +274,7 @@ static void spudec_set_button (spu_decoder_t *this_gen, int32_t button, int32_t
     xprintf(this->stream->xine, XINE_VERBOSITY_DEBUG, 
 	    "libspudec:xine_decoder.c:spudec_event_listener:HIDE ????\n");
     printf("We dropped out here for some reason");
-    abort();
+    _x_abort();
     overlay_event->object.handle = this->menu_handle;
     overlay_event->event_type = OVERLAY_EVENT_HIDE;
   }
diff --git a/src/libw32dll/qt_decoder.c b/src/libw32dll/qt_decoder.c
index ae4fce7be..12a16740b 100644
--- a/src/libw32dll/qt_decoder.c
+++ b/src/libw32dll/qt_decoder.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: qt_decoder.c,v 1.32 2004/01/12 17:35:17 miguelfreitas Exp $
+ * $Id: qt_decoder.c,v 1.33 2004/03/03 20:09:14 mroi Exp $
  *
  * quicktime video/audio decoder plugin, using win32 dlls
  * most of this code comes directly from MPlayer
@@ -338,7 +338,7 @@ static void qta_init_driver (qta_decoder_t *this, buf_element_t *buf) {
     break;
   default:
     xprintf (this->stream->xine, XINE_VERBOSITY_DEBUG, "qt_audio: fourcc for buftype %08x ?\n", buf->type);
-    abort ();
+    _x_abort ();
   }
 
   this->OutputFormatInfo.format = FOUR_CHAR_CODE('N','O','N','E');
@@ -418,7 +418,7 @@ static void qta_init_driver (qta_decoder_t *this, buf_element_t *buf) {
   default:
     xprintf (this->stream->xine, XINE_VERBOSITY_DEBUG, 
 	     "qt_audio: help, %d channels ?!\n", this->wave.nChannels);
-    abort ();
+    _x_abort ();
   }
 
   this->frame_size = this->wave.nChannels * this->wave.wBitsPerSample / 8;
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();
   }
 }
 
diff --git a/src/xine-engine/audio_decoder.c b/src/xine-engine/audio_decoder.c
index e6c6411f3..ff1d01314 100644
--- a/src/xine-engine/audio_decoder.c
+++ b/src/xine-engine/audio_decoder.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: audio_decoder.c,v 1.120 2004/02/12 18:19:12 mroi Exp $
+ * $Id: audio_decoder.c,v 1.121 2004/03/03 20:09:18 mroi Exp $
  *
  *
  * functions that implement audio decoding
@@ -438,7 +438,7 @@ void _x_audio_decoder_init (xine_stream_t *stream) {
                                &pth_attrs, audio_decoder_loop, stream)) != 0) {
       xprintf (stream->xine, XINE_VERBOSITY_DEBUG, 
 	       "audio_decoder: can't create new thread (%s)\n", strerror(err));
-      abort();
+      _x_abort();
     }
   
     pthread_attr_destroy(&pth_attrs);
diff --git a/src/xine-engine/audio_out.c b/src/xine-engine/audio_out.c
index 099f5462d..3273d3f55 100644
--- a/src/xine-engine/audio_out.c
+++ b/src/xine-engine/audio_out.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 self program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA
  *
- * $Id: audio_out.c,v 1.163 2004/02/12 18:09:19 mroi Exp $
+ * $Id: audio_out.c,v 1.164 2004/03/03 20:09:16 mroi Exp $
  *
  * 22-8-2001 James imported some useful AC3 sections from the previous alsa driver.
  *   (c) 2001 Andy Lo A Foe <andy@alsaplayer.org>
@@ -1945,7 +1945,7 @@ xine_audio_port_t *_x_ao_new_port (xine_t *xine, ao_driver_t *driver,
 	       "audio_out: can't create thread (%s)\n", strerror(err));
       xprintf (this->xine, XINE_VERBOSITY_LOG, 
 	       _("audio_out: sorry, this should not happen. please restart xine.\n"));
-      abort();
+      _x_abort();
       
     } else
       xprintf (this->xine, XINE_VERBOSITY_DEBUG, "thread created\n");
diff --git a/src/xine-engine/broadcaster.c b/src/xine-engine/broadcaster.c
index 4e0b4142e..95fa1cb9e 100644
--- a/src/xine-engine/broadcaster.c
+++ b/src/xine-engine/broadcaster.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2000-2003 the xine project
+ * Copyright (C) 2000-2004 the xine project
  * May 2003 - Miguel Freitas
  * This feature was sponsored by 1Control
  *
@@ -19,7 +19,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: broadcaster.c,v 1.5 2003/12/05 15:55:04 f1rmb Exp $
+ * $Id: broadcaster.c,v 1.6 2004/03/03 20:09:16 mroi Exp $
  * 
  * broadcaster.c - xine network broadcaster
  *
@@ -335,7 +335,7 @@ broadcaster_t *_x_init_broadcaster(xine_stream_t *stream, int port)
                              NULL, manager_loop, (void *)this)) != 0) {
     xprintf (stream->xine, XINE_VERBOSITY_DEBUG, 
 	     "broadcaster: can't create new thread (%s)\n", strerror(err));
-    abort();
+    _x_abort();
   }
   
   return this;  
diff --git a/src/xine-engine/buffer.c b/src/xine-engine/buffer.c
index 1f7c896d6..4bf3f5fc9 100644
--- a/src/xine-engine/buffer.c
+++ b/src/xine-engine/buffer.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: buffer.c,v 1.34 2003/12/07 15:34:30 f1rmb Exp $
+ * $Id: buffer.c,v 1.35 2004/03/03 20:09:16 mroi Exp $
  *
  *
  * contents:
@@ -65,7 +65,7 @@ static void buffer_pool_free (buf_element_t *element) {
   this->buffer_pool_num_free++;
   if (this->buffer_pool_num_free > this->buffer_pool_capacity) {
     printf("xine-lib:buffer: Their has been a fatal error: TOO MANY FREE's\n");
-    abort();
+    _x_abort();
   }
   
   pthread_cond_signal (&this->buffer_pool_cond_not_empty);
diff --git a/src/xine-engine/configfile.c b/src/xine-engine/configfile.c
index e30d59994..87791acb0 100644
--- a/src/xine-engine/configfile.c
+++ b/src/xine-engine/configfile.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: configfile.c,v 1.61 2004/01/16 23:03:38 f1rmb Exp $
+ * $Id: configfile.c,v 1.62 2004/03/03 20:09:16 mroi Exp $
  *
  * config object (was: file) management - implementation
  *
@@ -709,7 +709,7 @@ void xine_config_load (xine_t *xine, const char *filename) {
 	    break;
           default:
             printf ("xine_interface: error, unknown config entry type %d\n", entry->type);
-            abort();
+            _x_abort();
           }
 	}
       }
@@ -940,7 +940,7 @@ config_values_t *_x_config_init (void) {
   if (!(this = xine_xmalloc(sizeof(config_values_t)))) {
 
     printf ("configfile: could not allocate config object\n");
-    abort();
+    _x_abort();
   }
 
   this->first = NULL;
diff --git a/src/xine-engine/demux.c b/src/xine-engine/demux.c
index 3aeb292f0..716b4e974 100644
--- a/src/xine-engine/demux.c
+++ b/src/xine-engine/demux.c
@@ -20,7 +20,7 @@
  * Demuxer helper functions
  * hide some xine engine details from demuxers and reduce code duplication
  *
- * $Id: demux.c,v 1.46 2004/02/12 18:19:44 mroi Exp $ 
+ * $Id: demux.c,v 1.47 2004/03/03 20:09:16 mroi Exp $ 
  */
 
 
@@ -299,7 +299,7 @@ int _x_demux_start_thread (xine_stream_t *stream) {
     if ((err = pthread_create (&stream->demux_thread,
 			       NULL, demux_loop, (void *)stream)) != 0) {
       printf ("demux: can't create new thread (%s)\n", strerror(err));
-      abort();
+      _x_abort();
     }
   }
   
diff --git a/src/xine-engine/events.c b/src/xine-engine/events.c
index 0d77bd9d7..3470db749 100644
--- a/src/xine-engine/events.c
+++ b/src/xine-engine/events.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: events.c,v 1.22 2003/12/09 00:02:36 f1rmb Exp $
+ * $Id: events.c,v 1.23 2004/03/03 20:09:16 mroi Exp $
  *
  * Event handling functions
  *
@@ -220,6 +220,6 @@ void xine_event_create_listener_thread (xine_event_queue_t *queue,
 			     NULL, listener_loop, queue)) != 0) {
     xprintf (queue->stream->xine, XINE_VERBOSITY_DEBUG,
 	     "events: can't create new thread (%s)\n", strerror(err));
-    abort();
+    _x_abort();
   }
 }
diff --git a/src/xine-engine/load_plugins.c b/src/xine-engine/load_plugins.c
index e484a58a2..94d8e62f2 100644
--- a/src/xine-engine/load_plugins.c
+++ b/src/xine-engine/load_plugins.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: load_plugins.c,v 1.172 2004/02/12 18:23:35 mroi Exp $
+ * $Id: load_plugins.c,v 1.173 2004/03/03 20:09:17 mroi Exp $
  *
  *
  * Load input/demux/audio_out/video_out/codec plugins
@@ -76,7 +76,7 @@ static void segv_handler (int hubba) {
   printf ("\nload_plugins: Initialization of plugin '%s' failed (segmentation fault).\n",plugin_name);
   printf ("load_plugins: You probably need to remove the offending file.\n");
   printf ("load_plugins: (This error is usually due an incorrect plugin version)\n");
-  abort();
+  _x_abort();
 }
 
 static void install_segv_handler(void){
@@ -348,7 +348,7 @@ static void _insert_plugin (xine_t *this,
     if (decoder_old == NULL) {
       xprintf (this, XINE_VERBOSITY_DEBUG,
 	       "load_plugins: plugin %s from %s is broken: special_info = NULL\n", info->id, entry->filename);
-      abort();
+      _x_abort();
     }
     for (i=0; decoder_old->supported_types[i] != 0; ++i);
     types = xine_xmalloc((i+1)*sizeof(uint32_t));
@@ -932,7 +932,7 @@ void _x_scan_plugins (xine_t *this) {
   if (this == NULL || this->config == NULL) {
     fprintf(stderr, "%s(%s@%d): parameter should be non null, exiting\n",
 	    __FILE__, __XINE_FUNCTION__, __LINE__);
-    abort();
+    _x_abort();
   }
 #endif
 
@@ -1019,7 +1019,7 @@ static demux_plugin_t *probe_demux (xine_stream_t *stream, int method1, int meth
 
   if (methods[0] == -1) {
     xprintf (stream->xine, XINE_VERBOSITY_DEBUG, "load_plugins: probe_demux method1 = %d is not allowed \n", method1);
-    abort();
+    _x_abort();
   }
 
   i = 0;
@@ -1073,7 +1073,7 @@ demux_plugin_t *_x_find_demux_plugin (xine_stream_t *stream, input_plugin_t *inp
   default:
     xprintf (stream->xine, XINE_VERBOSITY_LOG,
 	     _("load_plugins: unknown content detection strategy %d\n"), stream->xine->demux_strategy);
-    abort();
+    _x_abort();
   }
 
   return NULL;
diff --git a/src/xine-engine/video_decoder.c b/src/xine-engine/video_decoder.c
index e9fe388d5..d77681a4c 100644
--- a/src/xine-engine/video_decoder.c
+++ b/src/xine-engine/video_decoder.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_decoder.c,v 1.143 2004/02/12 18:19:12 mroi Exp $
+ * $Id: video_decoder.c,v 1.144 2004/03/03 20:09:17 mroi Exp $
  *
  */
 
@@ -419,7 +419,7 @@ void _x_video_decoder_init (xine_stream_t *stream) {
                                &pth_attrs, video_decoder_loop, stream)) != 0) {
       fprintf (stderr, "video_decoder: can't create new thread (%s)\n",
                strerror(err));
-      abort();
+      _x_abort();
     }
     
     pthread_attr_destroy(&pth_attrs);
diff --git a/src/xine-engine/video_out.c b/src/xine-engine/video_out.c
index 706dfeb80..8e45389a4 100644
--- a/src/xine-engine/video_out.c
+++ b/src/xine-engine/video_out.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.c,v 1.186 2004/02/19 02:50:26 rockyb Exp $
+ * $Id: video_out.c,v 1.187 2004/03/03 20:09:17 mroi Exp $
  *
  * frame allocation / queuing / scheduling / output functions
  */
@@ -1538,7 +1538,7 @@ xine_video_port_t *_x_vo_new_port (xine_t *xine, vo_driver_t *driver,
       /* FIXME: how does this happen ? */
       xprintf (this->xine, XINE_VERBOSITY_LOG,
 	       _("video_out: sorry, this should not happen. please restart xine.\n"));
-      abort();
+      _x_abort();
     }
     else
       xprintf(this->xine, XINE_VERBOSITY_DEBUG, "video_out: thread created\n");
diff --git a/src/xine-engine/xine.c b/src/xine-engine/xine.c
index 282cc2db3..2630cbb96 100644
--- a/src/xine-engine/xine.c
+++ b/src/xine-engine/xine.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: xine.c,v 1.283 2004/02/16 20:19:10 uid86226 Exp $
+ * $Id: xine.c,v 1.284 2004/03/03 20:09:18 mroi Exp $
  */
 
 /*
@@ -1270,7 +1270,7 @@ xine_t *xine_new (void) {
 
   this = xine_xmalloc (sizeof (xine_t));
   if (!this)
-    abort();
+    _x_abort();
 
 #ifdef ENABLE_NLS
   /*
@@ -1644,7 +1644,7 @@ int xine_get_current_frame (xine_stream_t *stream, int *width, int *height,
     default:
       xprintf (stream->xine, XINE_VERBOSITY_DEBUG, 
 	       "xine: error, snapshot function not implemented for format 0x%x\n", frame->format);
-      abort ();
+      _x_abort ();
     }
   }
   return 1;
@@ -1658,7 +1658,7 @@ int xine_get_video_frame (xine_stream_t *stream,
 			  int *format,
 			  uint8_t *img) {
   xprintf (stream->xine, XINE_VERBOSITY_DEBUG, "xine: xine_get_video_frame not implemented yet.\n");
-  abort ();
+  _x_abort ();
   return 0;
 }
 
@@ -1767,7 +1767,7 @@ const char *const *xine_get_log (xine_t *this, int buf) {
 void xine_register_log_cb (xine_t *this, xine_log_cb_t cb, void *user_data) {
 
   printf ("xine: xine_register_log_cb: not implemented yet.\n");
-  abort();
+  _x_abort();
 }
 
 
@@ -1777,7 +1777,7 @@ int xine_get_error (xine_stream_t *stream) {
 
 int xine_trick_mode (xine_stream_t *stream, int mode, int value) {
   printf ("xine: xine_trick_mode not implemented yet.\n");
-  abort ();
+  _x_abort ();
 }
 
 int xine_stream_master_slave(xine_stream_t *master, xine_stream_t *slave,
diff --git a/src/xine-engine/xine_interface.c b/src/xine-engine/xine_interface.c
index 9ea2ffbd5..81531cb3e 100644
--- a/src/xine-engine/xine_interface.c
+++ b/src/xine-engine/xine_interface.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: xine_interface.c,v 1.79 2004/02/16 20:19:10 uid86226 Exp $
+ * $Id: xine_interface.c,v 1.80 2004/03/03 20:09:18 mroi Exp $
  *
  * convenience/abstraction layer, functions to implement
  * libxine's public interface
@@ -283,7 +283,7 @@ void xine_config_update_entry (xine_t *this, const xine_cfg_entry_t *entry) {
   default:
     xprintf (this, XINE_VERBOSITY_DEBUG, 
 	     "xine_interface: error, unknown config entry type %d\n", entry->type);
-    abort();
+    _x_abort();
   }
 }
   
diff --git a/src/xine-utils/xine_check.c b/src/xine-utils/xine_check.c
index 9840c0552..91fb40186 100644
--- a/src/xine-utils/xine_check.c
+++ b/src/xine-utils/xine_check.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.
 *
@@ -79,18 +79,18 @@ static void set_hc_result(xine_health_check_t* hc, int state, char *format, ...)
 
   if (!hc) {
     printf ("xine_check: GASP, hc is NULL\n");
-    abort();
+    _x_abort();
   }
 
   if (!format) {
     printf ("xine_check: GASP, format is NULL\n");
-    abort();
+    _x_abort();
   }
 
   size = strlen(format) + 1;
 
   if (!(buf = xine_xmalloc(size)))
-    abort();
+    _x_abort();
 
   while(1) {
     va_start(args, format);
@@ -110,7 +110,7 @@ static void set_hc_result(xine_health_check_t* hc, int state, char *format, ...)
 
     if((buf = realloc(buf, size)) == NULL) {
       printf("%s() GASP, realloc() failed\n", __XINE_FUNCTION__);
-      abort();
+      _x_abort();
     }
   }