diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-03-22 18:52:21 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-03-22 18:52:21 +0100 |
| commit | cd1d4b51e3ed741439557b6943213748ed3f300d (patch) | |
| tree | c4d1c285df94d1848b4f1a2938cf25fd1d1d5a3c /libavutil/float_dsp.c | |
| parent | 8d024c51071ded5e6d4fa500ee5f3c1ce4886d07 (diff) | |
| parent | 46caba4a65237c006ab54b0c16ecc00d21dedda1 (diff) | |
| download | ffmpeg-cd1d4b51e3ed741439557b6943213748ed3f300d.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
float_dsp: Replace arch optimization ifdefs by if cascade
Conflicts:
libavutil/float_dsp.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavutil/float_dsp.c')
| -rw-r--r-- | libavutil/float_dsp.c | 21 |
1 files changed, 10 insertions, 11 deletions
diff --git a/libavutil/float_dsp.c b/libavutil/float_dsp.c index 3477c30060..8ac74800ee 100644 --- a/libavutil/float_dsp.c +++ b/libavutil/float_dsp.c @@ -127,17 +127,16 @@ 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_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); -#elif ARCH_X86 - ff_float_dsp_init_x86(fdsp); -#elif ARCH_MIPS - ff_float_dsp_init_mips(fdsp); -#endif + if (ARCH_AARCH64) + ff_float_dsp_init_aarch64(fdsp); + if (ARCH_ARM) + ff_float_dsp_init_arm(fdsp); + if (ARCH_PPC) + ff_float_dsp_init_ppc(fdsp, bit_exact); + if (ARCH_X86) + ff_float_dsp_init_x86(fdsp); + if (ARCH_MIPS) + ff_float_dsp_init_mips(fdsp); } #ifdef TEST |