summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--help/help_mp-en.h19
-rw-r--r--mplayer.c8
2 files changed, 23 insertions, 4 deletions
diff --git a/help/help_mp-en.h b/help/help_mp-en.h
index b03fdab86a..8cd006d2d7 100644
--- a/help/help_mp-en.h
+++ b/help/help_mp-en.h
@@ -135,6 +135,25 @@ static char help_text[]=
#define MSGTR_NotInitializeVOPorVO "\nFATAL: Could not initialize video filters (-vop) or video output (-vo).\n"
#define MSGTR_Paused "\n================= PAUSED =================\r"
#define MSGTR_PlaylistLoadUnable "\nUnable to load playlist %s.\n"
+#define MSGTR_Exit_SIGILL_RTCpuSel \
+"- MPlayer crashed by 'Illegal Instruction'.\n"\
+" It may be a bug in our new runtime cpu-detection code...\n"\
+" please read DOCS/bugreports.html\n"
+#define MSGTR_Exit_SIGILL \
+"- MPlayer crashed by 'Illegal Instruction'.\n"\
+" It usually happens when you run it on different CPU than it was\n"\
+" compiled/optimized for.\n Verify this!\n"
+#define MSGTR_Exit_SIGSEGV_SIGFPE \
+"- MPlayer crashed by bad usage of CPU/FPU/RAM.\n"\
+" Recompile MPlayer with --enable-debug and make a 'gdb' backtrace and\n"\
+" disassembly. For details, see DOCS/bugreports.html section 5.b.\n"
+#define MSGTR_Exit_SIGCRASH \
+"- MPlayer crashed. This shouldn't happen.\n"\
+" It can be a bug in the MPlayer code _or_ in your drivers _or_ in your gcc\n"\
+" version. If you think it's MPlayer's fault, please read DOCS/bugreports.html\n"\
+" and follow instructions there. We can't and won't help unless you provide\n"\
+" these informations when reporting a possible bug.\n"
+
// mencoder.c:
diff --git a/mplayer.c b/mplayer.c
index 1e6438b1f1..3e3683a119 100644
--- a/mplayer.c
+++ b/mplayer.c
@@ -482,15 +482,15 @@ static void exit_sighandler(int x){
break; // killed from keyboard (^C) or killed [-9]
case SIGILL:
#ifdef RUNTIME_CPUDETECT
- mp_msg(MSGT_CPLAYER,MSGL_FATAL,"- MPlayer crashed by 'Illegal Instruction'. It may be a bug in our new runtime cpu-detection code... please read DOCS/bugreports.html\n");
+ mp_msg(MSGT_CPLAYER,MSGL_FATAL,MSGTR_Exit_SIGILL_RTCpuSel);
#else
- mp_msg(MSGT_CPLAYER,MSGL_FATAL,"- MPlayer crashed by 'Illegal Instruction'. It usually happens when you run it on different CPU than it was compiled/optimized for. Verify this!\n");
+ mp_msg(MSGT_CPLAYER,MSGL_FATAL,MSGTR_Exit_SIGILL);
#endif
case SIGFPE:
case SIGSEGV:
- mp_msg(MSGT_CPLAYER,MSGL_FATAL,"- MPlayer crashed by bad usage of CPU/FPU/RAM. Recompile MPlayer with --enable-debug and make a 'gdb' backtrace and disassembly. For details, see DOCS/bugreports.html section 5.b.\n");
+ mp_msg(MSGT_CPLAYER,MSGL_FATAL,MSGTR_Exit_SIGSEGV_SIGFPE);
default:
- mp_msg(MSGT_CPLAYER,MSGL_FATAL,"- MPlayer crashed. This shouldn't happen. It can be a bug in the MPlayer code _or_ in your drivers _or_ in your gcc version. If you think it's MPlayer's fault, please read DOCS/bugreports.html and follow instructions there. We can't and won't help unless you provide these informations when reporting a possible bug.\n");
+ mp_msg(MSGT_CPLAYER,MSGL_FATAL,MSGTR_Exit_SIGCRASH);
}
exit_player(NULL);
}