diff options
author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2009-04-09 02:38:33 +0300 |
---|---|---|
committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2009-04-09 02:38:37 +0300 |
commit | 0e8c38c19bb851a6433922a8068dd4887e79699d (patch) | |
tree | de605f3b78aef8281a94633da945acfda0dba641 /mplayer.c | |
parent | 6dd56815b44471026b4bd7623b4c56dfc98f2731 (diff) | |
parent | ca242e5f73d3bff1006b373b123b4749a33f5bd7 (diff) | |
download | mpv-0e8c38c19bb851a6433922a8068dd4887e79699d.tar.bz2 mpv-0e8c38c19bb851a6433922a8068dd4887e79699d.tar.xz |
Merge svn changes up to r29154
Synchronizes runtime CPU detection handling in the build system with
latest FFmpeg.
Diffstat (limited to 'mplayer.c')
-rw-r--r-- | mplayer.c | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -769,7 +769,7 @@ static void exit_sighandler(int x){ async_quit_request = 1; return; // killed from keyboard (^C) or killed [-9] case SIGILL: -#ifdef RUNTIME_CPUDETECT +#if CONFIG_RUNTIME_CPUDETECT mp_msg(MSGT_CPLAYER,MSGL_FATAL,MSGTR_Exit_SIGILL_RTCpuSel); #else mp_msg(MSGT_CPLAYER,MSGL_FATAL,MSGTR_Exit_SIGILL); |