virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-10 06:10:52 +02:00
Code Issues Releases Activity

Merge commit 'b280c6202b28b371a8d96850194fd69d7ad5dcc0'

Browse Source 
* commit 'b280c6202b28b371a8d96850194fd69d7ad5dcc0':
  arm: fft_vfp: Unify the behaviour in ff_fft_calc_vfp between arm/thumb

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer
2014-12-08 12:31:54 +01:00
parent 8554a10992 b280c6202b
commit 5054d2a92b
1 changed files with 5 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
libavcodec/arm/fft_vfp.S
View File

@@ -30,14 +30,10 @@
function ff_fft_calc_vfp, export=1 function ff_fft_calc_vfp, export=1
ldr ip, [a1, #0] @ nbits ldr ip, [a1, #0] @ nbits
mov a1, a2 mov a1, a2
A ldr pc, [pc, ip, lsl #2] movrel a2, (fft_tab_vfp - 8)
A .word 0 ldr pc, [a2, ip, lsl #2]
A .word 0 endfunc
A .word 0 const fft_tab_vfp
T movrel a2, (fft_tab_vfp - 8)
T ldr pc, [a2, ip, lsl #2]
T endfunc
T const fft_tab_vfp
.word fft4_vfp .word fft4_vfp
.word fft8_vfp .word fft8_vfp
.word X(ff_fft16_vfp) @ this one alone is exported .word X(ff_fft16_vfp) @ this one alone is exported
@@ -53,8 +49,7 @@ T const fft_tab_vfp
.word fft16384_vfp .word fft16384_vfp
.word fft32768_vfp .word fft32768_vfp
.word fft65536_vfp .word fft65536_vfp
A endfunc endconst
T endconst
function fft4_vfp function fft4_vfp
vldr d0, [a1, #0*2*4] @ s0,s1 = z[0] vldr d0, [a1, #0*2*4] @ s0,s1 = z[0]