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)
* commit '780cd20b00a69e26bbfffbb8eec16fbe999ea793':
  aarch64: Use .data.rel.ro for const data with relocations

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

Simple merge
Simple merge
Simple merge