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)
commit89c8eaa3216a48c1d18cc390525e90db74513f0c
tree390a2684c7821394702fcf644f13aedcf54d0290
parentee9e7a2e7a66501d5596f6bb992dc6afeaad8ec7
parent637606de2d2e0af0a9fa2f23f943765d7d7c5cd5
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>
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