[FFmpeg-cvslog] Merge commit 'a238b83b13640e3192d7d4aaad2242f13a9a84a1'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Aug  4 04:06:30 2014 +0200| [66eacd55807c4b0c257d644d2ee3156a43f6ba5b] | committer: Michael Niedermayer

Merge commit 'a238b83b13640e3192d7d4aaad2242f13a9a84a1'

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

Merged-by: Michael Niedermayer <michaelni at gmx.at>

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