aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec/arm/fft_neon.S
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-12-09 11:58:13 +0100
committerMichael Niedermayer <michaelni@gmx.at>2014-12-09 11:58:13 +0100
commit16e65419ed3e654a04091616bd81b8c96c79c268 (patch)
tree46e91a52bd14f4eee55c144675c321249d78ef98 /libavcodec/arm/fft_neon.S
parent99bf26fc6b17c05e9e1ec598a714c5efe1b978f6 (diff)
parentf963f80399deb1a2b44c1bac3af7123e8a0c9e46 (diff)
downloadffmpeg-16e65419ed3e654a04091616bd81b8c96c79c268.tar.gz
Merge commit 'f963f80399deb1a2b44c1bac3af7123e8a0c9e46'
* commit 'f963f80399deb1a2b44c1bac3af7123e8a0c9e46': arm: Use .data.rel.ro for const data with relocations Conflicts: configure Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/arm/fft_neon.S')
-rw-r--r--libavcodec/arm/fft_neon.S2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/arm/fft_neon.S b/libavcodec/arm/fft_neon.S
index 8b9ae2a82d..48f8dfc424 100644
--- a/libavcodec/arm/fft_neon.S
+++ b/libavcodec/arm/fft_neon.S
@@ -348,7 +348,7 @@ function ff_fft_permute_neon, export=1
pop {r4,pc}
endfunc
-const fft_tab_neon
+const fft_tab_neon, relocate=1
.word fft4_neon
.word fft8_neon
.word fft16_neon