diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-08-29 14:23:28 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-08-29 14:24:07 +0200 |
| commit | 29daad5b98bc07b9669c22b39113f5568ef1c570 (patch) | |
| tree | da5f75b91d52033bcfd57bda471fa119d730701c /libavutil/ppc/float_dsp_init.c | |
| parent | 2a60666d1d94cb907060b83a182cb5302a1add4b (diff) | |
| parent | f61bece684d9685b07895508e6c1c733b5564ccf (diff) | |
| download | ffmpeg-29daad5b98bc07b9669c22b39113f5568ef1c570.tar.gz | |
Merge commit 'f61bece684d9685b07895508e6c1c733b5564ccf'
* commit 'f61bece684d9685b07895508e6c1c733b5564ccf':
ppc: Add and use convenience macro to check for AltiVec availability
Conflicts:
libavcodec/ppc/dsputil_ppc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavutil/ppc/float_dsp_init.c')
| -rw-r--r-- | libavutil/ppc/float_dsp_init.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/libavutil/ppc/float_dsp_init.c b/libavutil/ppc/float_dsp_init.c index fc6ff396e8..9dd2072b7a 100644 --- a/libavutil/ppc/float_dsp_init.c +++ b/libavutil/ppc/float_dsp_init.c @@ -22,12 +22,12 @@ #include "libavutil/attributes.h" #include "libavutil/cpu.h" #include "libavutil/float_dsp.h" +#include "libavutil/ppc/cpu.h" #include "float_dsp_altivec.h" av_cold void ff_float_dsp_init_ppc(AVFloatDSPContext *fdsp, int bit_exact) { -#if HAVE_ALTIVEC - if (!(av_get_cpu_flags() & AV_CPU_FLAG_ALTIVEC)) + if (!PPC_ALTIVEC(av_get_cpu_flags())) return; fdsp->vector_fmul = ff_vector_fmul_altivec; @@ -37,5 +37,4 @@ av_cold void ff_float_dsp_init_ppc(AVFloatDSPContext *fdsp, int bit_exact) if (!bit_exact) { fdsp->vector_fmul_window = ff_vector_fmul_window_altivec; } -#endif } |