Merge commit 'a238b83b13640e3192d7d4aaad2242f13a9a84a1'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 4 Aug 2014 02:06:30 +0000 (04:06 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 4 Aug 2014 02:06:34 +0000 (04:06 +0200)
* commit 'a238b83b13640e3192d7d4aaad2242f13a9a84a1':
  aarch64: use MACH-O const data asm directive in const macro

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

Simple merge