Merge commit 'd5a55981986ac5d1a31aef3a8d16eaff8534a412'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 4 Jun 2014 10:45:29 +0000 (12:45 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 4 Jun 2014 10:45:35 +0000 (12:45 +0200)
* commit 'd5a55981986ac5d1a31aef3a8d16eaff8534a412':
  build: check if AS supports the '.func' directive

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
configure
libavutil/aarch64/asm.S
libavutil/arm/asm.S

diff --cc configure
Simple merge
Simple merge
Simple merge