summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorErik de Castro Lopo <erikd@mega-nerd.com>2016-12-06 19:37:52 +1100
committerErik de Castro Lopo <erikd@mega-nerd.com>2016-12-06 20:05:38 +1100
commit7b91f2383ba3c89243dfcae187fb549f9a72bd70 (patch)
treedad0655cb1569ab62fe003829ad4ce889c04bc2c
parent0ff8984384d4f7b6f475b8898cc9a4b6d018017c (diff)
downloadflac-7b91f2383ba3c89243dfcae187fb549f9a72bd70.tar.gz
libFLAC/cpu.c: Improve logic
Only call `FLAC__cpu_have_cpuid_asm_ia32` if `FLAC__HAS_NASM` is defined. Patch-from: "lvqcl.mail" <lvqcl.mail@gmail.com>
-rw-r--r--src/libFLAC/cpu.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libFLAC/cpu.c b/src/libFLAC/cpu.c
index dbfca248..6a6095f0 100644
--- a/src/libFLAC/cpu.c
+++ b/src/libFLAC/cpu.c
@@ -107,7 +107,7 @@ ia32_cpu_info (FLAC__CPUInfo *info)
#if !defined FLAC__NO_ASM && (defined FLAC__HAS_NASM || FLAC__HAS_X86INTRIN)
info->use_asm = true; /* we assume a minimum of 80386 with FLAC__CPU_IA32 */
-#if !FLAC__HAS_X86INTRIN
+#if defined FLAC__HAS_NASM
if(!FLAC__cpu_have_cpuid_asm_ia32())
return;
#endif