diff options
| author | bcoudurier <bcoudurier@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2008-09-05 01:44:33 +0000 |
|---|---|---|
| committer | bcoudurier <bcoudurier@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2008-09-05 01:44:33 +0000 |
| commit | 244d3d16221107cda2456706a0a60a33166db7e6 (patch) | |
| tree | 1b0df13b36425b570dac6986f9c856d145303d31 /libswscale | |
| parent | 3178a5606aa85d993258695733fb01568790fe99 (diff) | |
| download | mpv-244d3d16221107cda2456706a0a60a33166db7e6.tar.bz2 mpv-244d3d16221107cda2456706a0a60a33166db7e6.tar.xz | |
simplify function selection code
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27528 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libswscale')
| -rw-r--r-- | libswscale/swscale.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/libswscale/swscale.c b/libswscale/swscale.c index 8fdd5eb0cc..54e391cce6 100644 --- a/libswscale/swscale.c +++ b/libswscale/swscale.c @@ -2262,24 +2262,22 @@ SwsContext *sws_getContext(int srcW, int srcH, int srcFormat, int dstW, int dstH /* LQ converters if -sws 0 or -sws 4*/ if (c->flags&(SWS_FAST_BILINEAR|SWS_POINT)){ /* yv12_to_yuy2 */ - if (srcFormat == PIX_FMT_YUV420P && - (dstFormat == PIX_FMT_YUYV422 || dstFormat == PIX_FMT_UYVY422)) + if (srcFormat == PIX_FMT_YUV420P) { if (dstFormat == PIX_FMT_YUYV422) c->swScale= PlanarToYuy2Wrapper; - else + else if (dstFormat == PIX_FMT_UYVY422) c->swScale= PlanarToUyvyWrapper; } } #ifdef COMPILE_ALTIVEC if ((c->flags & SWS_CPU_CAPS_ALTIVEC) && - ((srcFormat == PIX_FMT_YUV420P && - (dstFormat == PIX_FMT_YUYV422 || dstFormat == PIX_FMT_UYVY422)))) { + srcFormat == PIX_FMT_YUV420P) { // unscaled YV12 -> packed YUV, we want speed if (dstFormat == PIX_FMT_YUYV422) c->swScale= yv12toyuy2_unscaled_altivec; - else + else if (dstFormat == PIX_FMT_UYVY422) c->swScale= yv12touyvy_unscaled_altivec; } #endif |