Merge commit '637606de2d2e0af0a9fa2f23f943765d7d7c5cd5'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 8 Dec 2012 13:19:55 +0000 (14:19 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 8 Dec 2012 13:19:55 +0000 (14:19 +0100)
* 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  2 
configure
libavcodec/arm/aac.h
libavcodec/arm/dca.h
libavcodec/arm/dsputil_arm.S
libavcodec/arm/mathops.h
libavcodec/arm/vp56_arith.h
libavcodec/arm/vp8.h
libavutil/arm/asm.S
libavutil/arm/bswap.h
libavutil/arm/intmath.h

diff --cc configure
+++ b/configure
@@@ -1555,11 -1392,8 +1555,13 @@@ 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"
 +mipsdspr2_deps="mips"
 +
  altivec_deps="ppc"
  ppc4xx_deps="ppc"
  
Simple merge
@@@ -25,7 -25,7 +25,7 @@@
  #include "config.h"
  #include "libavutil/intmath.h"
  
- #if HAVE_ARMV6 && HAVE_INLINE_ASM && AV_GCC_VERSION_AT_LEAST(4,4) && !CONFIG_THUMB
 -#if HAVE_ARMV6_INLINE && AV_GCC_VERSION_AT_LEAST(4,4)
++#if HAVE_ARMV6_INLINE && AV_GCC_VERSION_AT_LEAST(4,4) && !CONFIG_THUMB
  
  #define decode_blockcodes decode_blockcodes
  static inline int decode_blockcodes(int code1, int code2, int levels,
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge