Merge commit '637606de2d2e0af0a9fa2f23f943765d7d7c5cd5'

* commit '637606de2d2e0af0a9fa2f23f943765d7d7c5cd5':
  configure: arm: make _inline arch ext symbols depend on inline_asm
  arm: use HAVE*_INLINE/EXTERNAL macros for conditional compilation

Conflicts:
	configure
	libavcodec/arm/dca.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>

1 files changed, 2 insertions, 0 deletions

diff --git a/configure b/configure
index b8895b631f..cbb243cd2f 100755
--- a/configure
+++ b/configure
@@ -1555,6 +1555,8 @@ armvfp_deps="arm"
 neon_deps="arm"
 vfpv3_deps="armvfp"
 
+map 'eval ${v}_inline_deps=inline_asm' $ARCH_EXT_LIST_ARM
+
 mipsfpu_deps="mips"
 mips32r2_deps="mips"
 mipsdspr1_deps="mips"