Skip to content
Snippets Groups Projects
Commit 89c8eaa3 authored by Michael Niedermayer's avatar Michael Niedermayer
Browse files

Merge commit '637606de' 


* commit '637606de':
  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: default avatarMichael Niedermayer <michaelni@gmx.at>
parents ee9e7a2e 637606de
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 23 additions and 21 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment