diff options
| author | Baptiste Coudurier <baptiste.coudurier@gmail.com> | 2008-09-05 01:44:33 +0000 |
|---|---|---|
| committer | Baptiste Coudurier <baptiste.coudurier@gmail.com> | 2008-09-05 01:44:33 +0000 |
| commit | 3b38f1c60b94bd531e08aa26a91cdd53b778d4dc (patch) | |
| tree | 95571a5ce0e8e9946b793805366964fec962d4b5 /libswscale/swscale.c | |
| parent | a6100f39a11bd0cdc9f023c4e47fe75fec7a09fb (diff) | |
simplify function selection code
Originally committed as revision 27528 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
Diffstat (limited to 'libswscale/swscale.c')
| -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 |