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/yuv2yuv_altivec.c | |
parent | 4399e727237316c6491d800b7053dd44322c0ee7 (diff) | |
parent | c2503d9c8ab42ea55922e9f5a10c8bfbbbfeaf19 (diff) |
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/yuv2yuv_altivec.c')
-rw-r--r-- | libswscale/ppc/yuv2yuv_altivec.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/libswscale/ppc/yuv2yuv_altivec.c b/libswscale/ppc/yuv2yuv_altivec.c index 792deb9ee7..2036f2b637 100644 --- a/libswscale/ppc/yuv2yuv_altivec.c +++ b/libswscale/ppc/yuv2yuv_altivec.c @@ -28,6 +28,8 @@ #include "libswscale/swscale_internal.h" #include "libavutil/cpu.h" +#if HAVE_ALTIVEC + static int yv12toyuy2_unscaled_altivec(SwsContext *c, const uint8_t *src[], int srcStride[], int srcSliceY, int srcSliceH, uint8_t *dstParam[], @@ -179,8 +181,11 @@ static int yv12touyvy_unscaled_altivec(SwsContext *c, const uint8_t *src[], return srcSliceH; } -void ff_swscale_get_unscaled_altivec(SwsContext *c) +#endif /* HAVE_ALTIVEC */ + +void ff_swscale_get_unscaled_ppc(SwsContext *c) { +#if HAVE_ALTIVEC if ((av_get_cpu_flags() & AV_CPU_FLAG_ALTIVEC) && !(c->srcW & 15) && !(c->flags & SWS_BITEXACT) && c->srcFormat == AV_PIX_FMT_YUV420P) { enum AVPixelFormat dstFormat = c->dstFormat; @@ -191,4 +196,5 @@ void ff_swscale_get_unscaled_altivec(SwsContext *c) else if (dstFormat == AV_PIX_FMT_UYVY422) c->swScale = yv12touyvy_unscaled_altivec; } +#endif /* HAVE_ALTIVEC */ } |