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 /libavcodec/ppc/dsputil_ppc.c | |
| parent | 2a60666d1d94cb907060b83a182cb5302a1add4b (diff) | |
| parent | f61bece684d9685b07895508e6c1c733b5564ccf (diff) | |
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 'libavcodec/ppc/dsputil_ppc.c')
| -rw-r--r-- | libavcodec/ppc/dsputil_ppc.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/libavcodec/ppc/dsputil_ppc.c b/libavcodec/ppc/dsputil_ppc.c index 6112b0ccff..7454ea0f1e 100644 --- a/libavcodec/ppc/dsputil_ppc.c +++ b/libavcodec/ppc/dsputil_ppc.c @@ -25,6 +25,7 @@ #include "libavutil/attributes.h" #include "libavutil/cpu.h" #include "libavutil/mem.h" +#include "libavutil/ppc/cpu.h" #include "dsputil_altivec.h" /* ***** WARNING ***** WARNING ***** WARNING ***** */ @@ -156,8 +157,7 @@ av_cold void ff_dsputil_init_ppc(DSPContext *c, AVCodecContext *avctx) } } -#if HAVE_ALTIVEC - if (mm_flags & AV_CPU_FLAG_ALTIVEC) { + if (PPC_ALTIVEC(mm_flags)) { ff_dsputil_init_altivec(c, avctx); ff_int_init_altivec(c, avctx); c->gmc1 = ff_gmc1_altivec; @@ -180,5 +180,4 @@ av_cold void ff_dsputil_init_ppc(DSPContext *c, AVCodecContext *avctx) } } -#endif /* HAVE_ALTIVEC */ } |