Merge remote branch 'qatar/master'

[ffmpeg] / libavcodec / arm / mathops.h

diff --git a/libavcodec/arm/mathops.h b/libavcodec/arm/mathops.h
index 0d8e0442419913f7c07970f56016873fd8f97791..2244fa19ae58c27ae7f3bfa05def729eba2aed31 100644 (file)
--- a/libavcodec/arm/mathops.h
+++ b/libavcodec/arm/mathops.h
@@ -23,8 +23,11 @@
 #define AVCODEC_ARM_MATHOPS_H
 
 #include <stdint.h>
+#include "config.h"
 #include "libavutil/common.h"
 
+#if HAVE_INLINE_ASM
+
 #   define MULL MULL
 static inline av_const int MULL(int a, int b, unsigned shift)
 {
@@ -108,4 +111,6 @@ static inline av_const int mid_pred(int a, int b, int c)
     return m;
 }
 
+#endif /* HAVE_INLINE_ASM */
+
 #endif /* AVCODEC_ARM_MATHOPS_H */