diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-12-08 12:31:54 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-12-08 12:42:47 +0100 |
| commit | 5054d2a92ba77ed6ffc597045e80a89fe8b7bdc6 (patch) | |
| tree | c91e3fe8f2e0a0bb0420e581891bdd5280ef03a2 | |
| parent | 8554a10992de7b756e555a9a2b90590490e1fad7 (diff) | |
| parent | b280c6202b28b371a8d96850194fd69d7ad5dcc0 (diff) | |
| download | ffmpeg-5054d2a92ba77ed6ffc597045e80a89fe8b7bdc6.tar.gz | |
Merge commit 'b280c6202b28b371a8d96850194fd69d7ad5dcc0'
* commit 'b280c6202b28b371a8d96850194fd69d7ad5dcc0':
arm: fft_vfp: Unify the behaviour in ff_fft_calc_vfp between arm/thumb
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavcodec/arm/fft_vfp.S | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/libavcodec/arm/fft_vfp.S b/libavcodec/arm/fft_vfp.S index e1ab8f76bb..27be91293e 100644 --- a/libavcodec/arm/fft_vfp.S +++ b/libavcodec/arm/fft_vfp.S @@ -30,14 +30,10 @@ function ff_fft_calc_vfp, export=1 ldr ip, [a1, #0] @ nbits mov a1, a2 -A ldr pc, [pc, ip, lsl #2] -A .word 0 -A .word 0 -A .word 0 -T movrel a2, (fft_tab_vfp - 8) -T ldr pc, [a2, ip, lsl #2] -T endfunc -T const fft_tab_vfp + movrel a2, (fft_tab_vfp - 8) + ldr pc, [a2, ip, lsl #2] +endfunc +const fft_tab_vfp .word fft4_vfp .word fft8_vfp .word X(ff_fft16_vfp) @ this one alone is exported @@ -53,8 +49,7 @@ T const fft_tab_vfp .word fft16384_vfp .word fft32768_vfp .word fft65536_vfp -A endfunc -T endconst +endconst function fft4_vfp vldr d0, [a1, #0*2*4] @ s0,s1 = z[0] |