[x265] [PATCH 6 of 6] asm: upgrade runtime warning to explicit compile error

Steve Borho steve at borho.org
Fri Mar 6 18:07:23 CET 2015


# HG changeset patch
# User Steve Borho <steve at borho.org>
# Date 1425661623 21600
#      Fri Mar 06 11:07:03 2015 -0600
# Node ID 3eef0fe70475e17f5a671bf0dd522f89fb957b71
# Parent  a07ea06f3ee8a5d1edb2edc584934d38f26583d8
asm: upgrade runtime warning to explicit compile error

It is impossible to link the encoder in that configuration, so we must tell the
user at compile time that this will not work.

diff -r a07ea06f3ee8 -r 3eef0fe70475 source/common/x86/asm-primitives.cpp
--- a/source/common/x86/asm-primitives.cpp	Fri Mar 06 11:01:10 2015 -0600
+++ b/source/common/x86/asm-primitives.cpp	Fri Mar 06 11:07:03 2015 -0600
@@ -797,8 +797,7 @@
 void setupAssemblyPrimitives(EncoderPrimitives &p, int cpuMask) // 16bpp
 {
 #if !defined(X86_64)
-    x265_log(NULL, X265_LOG_WARNING, "Assembly not allowed in 32bit high bit-depth builds\n");
-    return;
+#error "Unsupported build configuration (32bit x86 and HIGH_BIT_DEPTH), you must configure ENABLE_ASSEMBLY=OFF"
 #endif
 
     if (cpuMask & X265_CPU_SSE2)


More information about the x265-devel mailing list