aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec/arm/fft_fixed_neon.S
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2012-07-01 22:12:38 +0200
committerMichael Niedermayer <michaelni@gmx.at>2012-07-01 22:43:09 +0200
commit5eb353e0cd62ad212634c14e4b863554c0bc6161 (patch)
tree0f53c933b7a61bf14553c3ab8abb8226bd9c23bb /libavcodec/arm/fft_fixed_neon.S
parent23eeffcd48a15e73fb2649b712870b6d101c5471 (diff)
parent3893feeccdf754057fc7c7ac711ae876733f2f33 (diff)
downloadffmpeg-5eb353e0cd62ad212634c14e4b863554c0bc6161.tar.gz
Merge remote-tracking branch 'qatar/master'
* qatar/master: opt/eval: Include mathematics.h for NAN/INFINITY mathematics: Don't use division by zero in NAN/INFINITY macros wma: Lower the maximum number of channels to 2 x86: cpu: clean up check for cpuid instruction support ARM: generate position independent code to access data symbols Conflicts: libavutil/opt.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/arm/fft_fixed_neon.S')
-rw-r--r--libavcodec/arm/fft_fixed_neon.S2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/arm/fft_fixed_neon.S b/libavcodec/arm/fft_fixed_neon.S
index 2430ada0ff..fa33eac06a 100644
--- a/libavcodec/arm/fft_fixed_neon.S
+++ b/libavcodec/arm/fft_fixed_neon.S
@@ -214,7 +214,7 @@ function fft\n\()_neon
bl fft\n4\()_neon
mov r0, r4
pop {r4, lr}
- movrel r1, X(ff_cos_\n\()_fixed)
+ movrelx r1, X(ff_cos_\n\()_fixed)
mov r2, #\n4/2
b fft_pass_neon
endfunc