diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-08-29 15:10:09 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-08-29 15:10:09 +0200 |
| commit | 5ff1b588eb4e639f0b3cfeff2118aadb2b43584a (patch) | |
| tree | 3a23e041ee9ffa0e5c1f9e73f7c75e4dfae5f623 /libswscale/ppc/swscale_altivec.c | |
| parent | 4399e727237316c6491d800b7053dd44322c0ee7 (diff) | |
| parent | c2503d9c8ab42ea55922e9f5a10c8bfbbbfeaf19 (diff) | |
| download | ffmpeg-5ff1b588eb4e639f0b3cfeff2118aadb2b43584a.tar.gz | |
Merge commit 'c2503d9c8ab42ea55922e9f5a10c8bfbbbfeaf19'
* commit 'c2503d9c8ab42ea55922e9f5a10c8bfbbbfeaf19':
swscale: ppc: Hide arch-specific initialization details
Conflicts:
libswscale/utils.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libswscale/ppc/swscale_altivec.c')
| -rw-r--r-- | libswscale/ppc/swscale_altivec.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/libswscale/ppc/swscale_altivec.c b/libswscale/ppc/swscale_altivec.c index 9ca2868cc8..86f40ab84f 100644 --- a/libswscale/ppc/swscale_altivec.c +++ b/libswscale/ppc/swscale_altivec.c @@ -30,6 +30,7 @@ #include "libavutil/cpu.h" #include "yuv2rgb_altivec.h" +#if HAVE_ALTIVEC #define vzero vec_splat_s32(0) #define yuv2planeX_8(d1, d2, l1, src, x, perm, filter) do { \ @@ -284,9 +285,11 @@ static void hScale_altivec_real(SwsContext *c, int16_t *dst, int dstW, } } } +#endif /* HAVE_ALTIVEC */ -av_cold void ff_sws_init_swScale_altivec(SwsContext *c) +av_cold void ff_sws_init_swscale_ppc(SwsContext *c) { +#if HAVE_ALTIVEC enum AVPixelFormat dstFormat = c->dstFormat; if (!(av_get_cpu_flags() & AV_CPU_FLAG_ALTIVEC)) @@ -325,4 +328,5 @@ av_cold void ff_sws_init_swScale_altivec(SwsContext *c) break; } } +#endif /* HAVE_ALTIVEC */ } |