summaryrefslogtreecommitdiff
path: root/libavcodec/arm/dca.h
diff options
context:
space:
mode:
authorMans Rullgard <mans@mansr.com>2012-12-01 16:41:39 +0000
committerMans Rullgard <mans@mansr.com>2012-12-07 16:54:03 +0000
commita7831d509f8db397f74895dca3dd3b4ac791ef03 (patch)
tree22cac51b499ab8c14039ac79cc78b8b75c6089f3 /libavcodec/arm/dca.h
parent7f2b3dcabd108926bde819ad574017f4161d1546 (diff)
arm: use HAVE*_INLINE/EXTERNAL macros for conditional compilation
These macros reflect the actual capabilities required here. Signed-off-by: Mans Rullgard <mans@mansr.com>
Diffstat (limited to 'libavcodec/arm/dca.h')
-rw-r--r--libavcodec/arm/dca.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/arm/dca.h b/libavcodec/arm/dca.h
index 9b0efc0e64..09b6e64baa 100644
--- a/libavcodec/arm/dca.h
+++ b/libavcodec/arm/dca.h
@@ -25,7 +25,7 @@
#include "config.h"
#include "libavutil/intmath.h"
-#if HAVE_ARMV6 && HAVE_INLINE_ASM && AV_GCC_VERSION_AT_LEAST(4,4)
+#if HAVE_ARMV6_INLINE && AV_GCC_VERSION_AT_LEAST(4,4)
#define decode_blockcodes decode_blockcodes
static inline int decode_blockcodes(int code1, int code2, int levels,
@@ -79,7 +79,7 @@ static inline int decode_blockcodes(int code1, int code2, int levels,
#endif
-#if HAVE_NEON && HAVE_INLINE_ASM && HAVE_ASM_MOD_Y
+#if HAVE_NEON_INLINE && HAVE_ASM_MOD_Y
#define int8x8_fmul_int32 int8x8_fmul_int32
static inline void int8x8_fmul_int32(float *dst, const int8_t *src, int scale)