Merge commit '780cd20b00a69e26bbfffbb8eec16fbe999ea793'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 9 Dec 2014 11:08:24 +0000 (12:08 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 9 Dec 2014 11:08:29 +0000 (12:08 +0100)
commit92d47e2aa3912fc9018ef10fb6272b288401ee47
tree5ea5fd0286881800f50c93e6fbef774afb4645f1
parent16e65419ed3e654a04091616bd81b8c96c79c268
parent780cd20b00a69e26bbfffbb8eec16fbe999ea793
Merge commit '780cd20b00a69e26bbfffbb8eec16fbe999ea793'

* commit '780cd20b00a69e26bbfffbb8eec16fbe999ea793':
  aarch64: Use .data.rel.ro for const data with relocations

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