[FFmpeg-cvslog] r29464 - trunk/libswscale/swscale.c

[cehoyos]

Author: cehoyos
Date: Sat Aug  1 23:30:36 2009
New Revision: 29464

Log:
Fix regression when converting to nv12/nv21.

Patch by Guennadi Liakhovetski,  g D liakhovetski A gmx D de

Modified:
   trunk/libswscale/swscale.c

Modified: trunk/libswscale/swscale.c
==============================================================================
--- trunk/libswscale/swscale.c	Fri Jul 31 22:13:02 2009	(r29463)
+++ trunk/libswscale/swscale.c	Sat Aug  1 23:30:36 2009	(r29464)
@@ -2759,7 +2759,9 @@ SwsContext *sws_getContext(int srcW, int
             || (isGray(dstFormat) && isGray(srcFormat))
             || (isPlanarYUV(srcFormat) && isPlanarYUV(dstFormat)
                 && c->chrDstHSubSample == c->chrSrcHSubSample
-                && c->chrDstVSubSample == c->chrSrcVSubSample))
+                && c->chrDstVSubSample == c->chrSrcVSubSample
+                && dstFormat != PIX_FMT_NV12 && dstFormat != PIX_FMT_NV21
+                && srcFormat != PIX_FMT_NV12 && srcFormat != PIX_FMT_NV21))
         {
             if (isPacked(c->srcFormat))
                 c->swScale= packedCopy;