[FFmpeg-cvslog] Merge commit '637606de2d2e0af0a9fa2f23f943765d7d7c5cd5'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sat Dec  8 14:19:55 2012 +0100| [89c8eaa3216a48c1d18cc390525e90db74513f0c] | committer: Michael Niedermayer

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 at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=89c8eaa3216a48c1d18cc390525e90db74513f0c
---