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)
commit66eacd55807c4b0c257d644d2ee3156a43f6ba5b
tree11aac1df05b1dad90991816bd7435b9db19899a8
parent7fd60d1e7ad032e6e926608758c5f5d736c37042
parenta238b83b13640e3192d7d4aaad2242f13a9a84a1
Merge commit 'a238b83b13640e3192d7d4aaad2242f13a9a84a1'

* commit 'a238b83b13640e3192d7d4aaad2242f13a9a84a1':
  aarch64: use MACH-O const data asm directive in const macro

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