diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-07-01 22:12:38 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-07-01 22:43:09 +0200 |
| commit | 5eb353e0cd62ad212634c14e4b863554c0bc6161 (patch) | |
| tree | 0f53c933b7a61bf14553c3ab8abb8226bd9c23bb /libavcodec/arm/fft_neon.S | |
| parent | 23eeffcd48a15e73fb2649b712870b6d101c5471 (diff) | |
| parent | 3893feeccdf754057fc7c7ac711ae876733f2f33 (diff) | |
| download | ffmpeg-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_neon.S')
| -rw-r--r-- | libavcodec/arm/fft_neon.S | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/arm/fft_neon.S b/libavcodec/arm/fft_neon.S index fe69f58cda..8b9ae2a82d 100644 --- a/libavcodec/arm/fft_neon.S +++ b/libavcodec/arm/fft_neon.S @@ -143,7 +143,7 @@ function fft16_neon vswp d29, d30 @ q14{r12,i12,i14,r15} q15{r13,i13,i15,r14} vadd.f32 q0, q12, q13 @ {t1,t2,t5,t6} vadd.f32 q1, q14, q15 @ {t1a,t2a,t5a,t6a} - movrel r2, X(ff_cos_16) + movrelx r2, X(ff_cos_16) vsub.f32 q13, q12, q13 @ {t3,t4,t7,t8} vrev64.32 d1, d1 vsub.f32 q15, q14, q15 @ {t3a,t4a,t7a,t8a} @@ -290,7 +290,7 @@ function fft\n\()_neon bl fft\n4\()_neon mov r0, r4 pop {r4, lr} - movrel r1, X(ff_cos_\n) + movrelx r1, X(ff_cos_\n) mov r2, #\n4/2 b fft_pass_neon endfunc |