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

Conflicts:
configure

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

diff --cc configure
+++ b/configure
@@@ -1824,12 -1542,8 +1824,13 @@@ HAVE_LIST=
      libc_msvcrt
      libdc1394_1
      libdc1394_2
 +    makeinfo
 +    makeinfo_html
 +    perl
 +    pod2man
      sdl
+     section_data_rel_ro
 +    texi2html
      threads
      vdpau_x11
      xlib
Simple merge
Simple merge
Simple merge
Simple merge