diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-06-11 02:33:58 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-06-11 02:50:50 +0200 |
| commit | 1290143fda931596f140dc1c31dd8a158710295e (patch) | |
| tree | 23550914a580a2e4e8607d1e78bc7832bb4c7fd9 /libavcodec/ppc/fmtconvert_altivec.c | |
| parent | 26be0e31fc486d81fcdf750ce895c6a5612be5ac (diff) | |
| parent | 27860819d508068f056cf48473af04868791ad77 (diff) | |
| download | ffmpeg-1290143fda931596f140dc1c31dd8a158710295e.tar.gz | |
Merge commit '27860819d508068f056cf48473af04868791ad77'
* commit '27860819d508068f056cf48473af04868791ad77':
ppc: Consistently use convenience macro for runtime CPU detection
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/ppc/fmtconvert_altivec.c')
| -rw-r--r-- | libavcodec/ppc/fmtconvert_altivec.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libavcodec/ppc/fmtconvert_altivec.c b/libavcodec/ppc/fmtconvert_altivec.c index 011633e4fe..10a7169d1b 100644 --- a/libavcodec/ppc/fmtconvert_altivec.c +++ b/libavcodec/ppc/fmtconvert_altivec.c @@ -22,6 +22,7 @@ #include "libavutil/attributes.h" #include "libavutil/cpu.h" #include "libavutil/mem.h" +#include "libavutil/ppc/cpu.h" #include "libavutil/ppc/util_altivec.h" #include "libavcodec/fmtconvert.h" @@ -164,7 +165,7 @@ av_cold void ff_fmt_convert_init_ppc(FmtConvertContext *c, AVCodecContext *avctx) { #if HAVE_ALTIVEC - if (!(av_get_cpu_flags() & AV_CPU_FLAG_ALTIVEC)) + if (!PPC_ALTIVEC(av_get_cpu_flags())) return; c->int32_to_float_fmul_scalar = int32_to_float_fmul_scalar_altivec; |