diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-07-22 12:05:16 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-07-22 12:05:39 +0200 |
| commit | c30eb74d182063c85a895c6fd3c9d47b93370bb0 (patch) | |
| tree | 4d8aa56462f23a2baded03134053c2ff849850eb /libavcodec/arm/mdct_vfp.S | |
| parent | bacba8e5d1e93f40132bfab6743fe8e0d798c4da (diff) | |
| parent | 8b9eba664edaddf9a304d3acbf0388b5c520781d (diff) | |
Merge commit '8b9eba664edaddf9a304d3acbf0388b5c520781d'
* commit '8b9eba664edaddf9a304d3acbf0388b5c520781d':
arm: Add VFP-accelerated version of fft16
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/arm/mdct_vfp.S')
| -rw-r--r-- | libavcodec/arm/mdct_vfp.S | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/libavcodec/arm/mdct_vfp.S b/libavcodec/arm/mdct_vfp.S index 2666b00bf4..1c98690e6f 100644 --- a/libavcodec/arm/mdct_vfp.S +++ b/libavcodec/arm/mdct_vfp.S @@ -174,9 +174,8 @@ function ff_imdct_half_vfp, export=1 .endr fmxr FPSCR, OLDFPSCR - mov ORIGOUT, OUT - ldr ip, [CONTEXT, #9*4] - blx ip @ s->fft_calc(s, output) + mov a1, OUT + bl ff_fft16_vfp ldr lr, =0x03030000 @ RunFast mode, short vectors of length 4, stride 1 fmxr FPSCR, lr |