Mercurial > mplayer.hg

changeset 27491:bb75465dc12a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix SWS_FAST_BILINEAR and SWS_POINT with some unscaled rgb<->bgr converters.
author michael
date Thu, 04 Sep 2008 22:31:22 +0000
parents 651ebfa4b7db
children a219635ccfa7
files libswscale/swscale.c
diffstat 1 files changed, 1 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/libswscale/swscale.c	Thu Sep 04 21:59:15 2008 +0000
+++ b/libswscale/swscale.c	Thu Sep 04 22:31:22 2008 +0000
@@ -2161,17 +2161,11 @@
            && 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))