[SCM] libav/experimental: Fix SWS_FAST_BILINEAR and SWS_POINT with some unscaled rgb<->bgr converters.

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit 736143c8d95c7dedd079567f141f1352021aadc4
Author: Michael Niedermayer <michaelni at gmx.at>
Date:   Thu Sep 4 22:31:22 2008 +0000

    Fix SWS_FAST_BILINEAR and SWS_POINT with some unscaled rgb<->bgr converters.
    
    Originally committed as revision 27523 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale

diff --git a/libswscale/swscale.c b/libswscale/swscale.c
index 7b96298..2c439d2 100644
--- a/libswscale/swscale.c
+++ b/libswscale/swscale.c
@@ -2161,17 +2161,11 @@ SwsContext *sws_getContext(int srcW, int srcH, int srcFormat, int dstW, int dstH
            && srcFormat != PIX_FMT_MONOBLACK && dstFormat != PIX_FMT_MONOBLACK
                                              && dstFormat != PIX_FMT_RGB32_1
                                              && dstFormat != PIX_FMT_BGR32_1
-           && !needsDither)
+           && (!needsDither || (c->flags&(SWS_FAST_BILINEAR|SWS_POINT))))
              c->swScale= rgb2rgbWrapper;
 
         /* LQ converters if -sws 0 or -sws 4*/
         if (c->flags&(SWS_FAST_BILINEAR|SWS_POINT)){
-            /* rgb/bgr -> rgb/bgr (dither needed forms) */
-            if ( (isBGR(srcFormat) || isRGB(srcFormat))
-              && (isBGR(dstFormat) || isRGB(dstFormat))
-              && needsDither)
-                c->swScale= rgb2rgbWrapper;
-
             /* yv12_to_yuy2 */
             if (srcFormat == PIX_FMT_YUV420P &&
                 (dstFormat == PIX_FMT_YUYV422 || dstFormat == PIX_FMT_UYVY422))

-- 
Libav/FFmpeg packaging