[FFmpeg-devel] [PATCH] avutil: disable arch specific intmath routines if optimizations are disabled

[Xiaolei Yu]

Current intmath routines for arm require inter-procedure constant propagation
and fail to compile when optimizations are disabled.
---
 configure           | 1 +
 libavutil/intmath.h | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/configure b/configure
index 2148f11..70e0161 100755
--- a/configure
+++ b/configure
@@ -1950,6 +1950,7 @@ HAVE_LIST="
     $THREADS_LIST
     $TOOLCHAIN_FEATURES
     $TYPES_LIST
+    optimizations
     atomics_native
     dos_paths
     dxva2_lib
diff --git a/libavutil/intmath.h b/libavutil/intmath.h
index 9573109..d15f210 100644
--- a/libavutil/intmath.h
+++ b/libavutil/intmath.h
@@ -26,12 +26,14 @@
 #include "config.h"
 #include "attributes.h"
 
+#if HAVE_OPTIMIZATIONS
 #if ARCH_ARM
 #   include "arm/intmath.h"
 #endif
 #if ARCH_X86
 #   include "x86/intmath.h"
 #endif
+#endif
 
 #if HAVE_FAST_CLZ
 #if AV_GCC_VERSION_AT_LEAST(3,4)
-- 
2.7.0