Merge commit 'c25fc5c2bb6ae8c93541c9427df3e47206d95152'

[ffmpeg] / libavutil / x86 / cpu.c

diff --git a/libavutil/x86/cpu.c b/libavutil/x86/cpu.c
index 3fee15209560efcbf0a93d315137a2a2043815f3..a3a5239159b424a03476886bb266a7d3b9c8b3f0 100644 (file)
--- a/libavutil/x86/cpu.c
+++ b/libavutil/x86/cpu.c
@@ -69,7 +69,7 @@
 
 #define cpuid_test ff_cpu_cpuid_test
 
-#elif HAVE_INLINE_ASM || HAVE_RWEFLAGS
+#elif HAVE_INLINE_ASM
 
 static int cpuid_test(void)
 {