Merge commit 'f963f80399deb1a2b44c1bac3af7123e8a0c9e46'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 9 Dec 2014 10:58:13 +0000 (11:58 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 9 Dec 2014 10:58:13 +0000 (11:58 +0100)
commit16e65419ed3e654a04091616bd81b8c96c79c268
tree46e91a52bd14f4eee55c144675c321249d78ef98
parent99bf26fc6b17c05e9e1ec598a714c5efe1b978f6
parentf963f80399deb1a2b44c1bac3af7123e8a0c9e46
Merge commit 'f963f80399deb1a2b44c1bac3af7123e8a0c9e46'

* commit 'f963f80399deb1a2b44c1bac3af7123e8a0c9e46':
  arm: Use .data.rel.ro for const data with relocations

Conflicts:
configure

Merged-by: Michael Niedermayer <michaelni@gmx.at>
configure
libavcodec/arm/fft_fixed_neon.S
libavcodec/arm/fft_neon.S
libavcodec/arm/fft_vfp.S
libavutil/arm/asm.S