summaryrefslogtreecommitdiffstats
path: root/mpcommon.c
diff options
context:
space:
mode:
authorUoti Urpala <uau@glyph.nonexistent.invalid>2009-04-09 02:38:33 +0300
committerUoti Urpala <uau@glyph.nonexistent.invalid>2009-04-09 02:38:37 +0300
commit0e8c38c19bb851a6433922a8068dd4887e79699d (patch)
treede605f3b78aef8281a94633da945acfda0dba641 /mpcommon.c
parent6dd56815b44471026b4bd7623b4c56dfc98f2731 (diff)
parentca242e5f73d3bff1006b373b123b4749a33f5bd7 (diff)
downloadmpv-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 'mpcommon.c')
-rw-r--r--mpcommon.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/mpcommon.c b/mpcommon.c
index e649f3e49d..11be57664a 100644
--- a/mpcommon.c
+++ b/mpcommon.c
@@ -43,7 +43,7 @@ void print_version(const char* name)
gCpuCaps.hasMMX, gCpuCaps.hasMMX2,
gCpuCaps.has3DNow, gCpuCaps.has3DNowExt,
gCpuCaps.hasSSE, gCpuCaps.hasSSE2, gCpuCaps.hasSSSE3);
-#ifdef RUNTIME_CPUDETECT
+#if CONFIG_RUNTIME_CPUDETECT
mp_msg(MSGT_CPLAYER,MSGL_V, MSGTR_CompiledWithRuntimeDetection);
#else
mp_msg(MSGT_CPLAYER,MSGL_V, MSGTR_CompiledWithCPUExtensions);
@@ -64,7 +64,7 @@ if (HAVE_SSSE3)
if (HAVE_CMOV)
mp_msg(MSGT_CPLAYER,MSGL_V," CMOV");
mp_msg(MSGT_CPLAYER,MSGL_V,"\n");
-#endif /* RUNTIME_CPUDETECT */
+#endif /* CONFIG_RUNTIME_CPUDETECT */
#endif /* ARCH_X86 */
}