diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-03-19 02:51:38 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-03-19 02:52:08 +0100 |
| commit | ce9d3daa8a40ba953fcaf04c8fc5dba0aa335c9e (patch) | |
| tree | 426b9a1e1ce45d2dcbced4bf20afd1625735fdb1 /libavutil/float_dsp.c | |
| parent | a2339ef7b9a3d5f79a0393a58e6388b1b81d4731 (diff) | |
| parent | dbd12523a407824a8ccbb9246a908f3ebb4b3376 (diff) | |
| download | ffmpeg-ce9d3daa8a40ba953fcaf04c8fc5dba0aa335c9e.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
aarch64: float_dsp NEON assembler
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavutil/float_dsp.c')
| -rw-r--r-- | libavutil/float_dsp.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/libavutil/float_dsp.c b/libavutil/float_dsp.c index e50dab0289..be85d20181 100644 --- a/libavutil/float_dsp.c +++ b/libavutil/float_dsp.c @@ -127,7 +127,9 @@ av_cold void avpriv_float_dsp_init(AVFloatDSPContext *fdsp, int bit_exact) fdsp->butterflies_float = butterflies_float_c; fdsp->scalarproduct_float = avpriv_scalarproduct_float_c; -#if ARCH_ARM +#if ARCH_AARCH64 + ff_float_dsp_init_aarch64(fdsp); +#elif ARCH_ARM ff_float_dsp_init_arm(fdsp); #elif ARCH_PPC ff_float_dsp_init_ppc(fdsp, bit_exact); |