har0ke/FFmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'qatar/master'

Browse Source 
* qatar/master:
  float_dsp: Replace arch optimization ifdefs by if cascade

Conflicts:
	libavutil/float_dsp.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2014-03-22 18:52:21 +01:00
commit cd1d4b51e3
1 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
libavutil/float_dsp.c
View File

@ -127,17 +127,16 @@ av_cold void avpriv_float_dsp_init(AVFloatDSPContext *fdsp, int bit_exact)
fdsp->butterflies_float = butterflies_float_c; fdsp->butterflies_float = butterflies_float_c;
fdsp->scalarproduct_float = avpriv_scalarproduct_float_c; fdsp->scalarproduct_float = avpriv_scalarproduct_float_c;
#if ARCH_AARCH64 if (ARCH_AARCH64)
ff_float_dsp_init_aarch64(fdsp); ff_float_dsp_init_aarch64(fdsp);
#elif ARCH_ARM if (ARCH_ARM)
ff_float_dsp_init_arm(fdsp); ff_float_dsp_init_arm(fdsp);
#elif ARCH_PPC if (ARCH_PPC)
ff_float_dsp_init_ppc(fdsp, bit_exact); ff_float_dsp_init_ppc(fdsp, bit_exact);
#elif ARCH_X86 if (ARCH_X86)
ff_float_dsp_init_x86(fdsp); ff_float_dsp_init_x86(fdsp);
#elif ARCH_MIPS if (ARCH_MIPS)
ff_float_dsp_init_mips(fdsp); ff_float_dsp_init_mips(fdsp);
#endif
} }
#ifdef TEST #ifdef TEST