diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-08-30 11:48:50 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-08-30 11:48:54 +0200 |
| commit | 09c94b57ca2c567ed6520c28f20a6a25c2950cb4 (patch) | |
| tree | 4e13f50392fffbfcd6be8d41e3e1c503db5d2cdb /libswscale/ppc | |
| parent | e45e72f5f89ef5a5791562cfcb935028b46ecd0a (diff) | |
| parent | a6b650118543e1580e872896d8976042b7c32d01 (diff) | |
| download | ffmpeg-streaming-09c94b57ca2c567ed6520c28f20a6a25c2950cb4.zip ffmpeg-streaming-09c94b57ca2c567ed6520c28f20a6a25c2950cb4.tar.gz | |
Merge commit 'a6b650118543e1580e872896d8976042b7c32d01'
* commit 'a6b650118543e1580e872896d8976042b7c32d01':
ppc: cosmetics: Consistently format CPU flag detection invocations
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libswscale/ppc')
| -rw-r--r-- | libswscale/ppc/yuv2yuv_altivec.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/libswscale/ppc/yuv2yuv_altivec.c b/libswscale/ppc/yuv2yuv_altivec.c index 64bd79c..3b89b5d 100644 --- a/libswscale/ppc/yuv2yuv_altivec.c +++ b/libswscale/ppc/yuv2yuv_altivec.c @@ -187,8 +187,11 @@ static int yv12touyvy_unscaled_altivec(SwsContext *c, const uint8_t *src[], av_cold void ff_get_unscaled_swscale_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) { + if (!(av_get_cpu_flags() & AV_CPU_FLAG_ALTIVEC)) + return NULL; + + if (!(c->srcW & 15) && !(c->flags & SWS_BITEXACT) && + c->srcFormat == AV_PIX_FMT_YUV420P) { enum AVPixelFormat dstFormat = c->dstFormat; // unscaled YV12 -> packed YUV, we want speed |
