# HG changeset patch # User cehoyos # Date 1249162236 0 # Node ID 532800a8d491244246f4bde408dded84e7443051 # Parent 0556a31731b1e3c1c2e5ddf7f2526c084f358bc8 Fix regression when converting to nv12/nv21. Patch by Guennadi Liakhovetski, g D liakhovetski A gmx D de diff -r 0556a31731b1 -r 532800a8d491 libswscale/swscale.c --- a/libswscale/swscale.c Fri Jul 31 20:13:02 2009 +0000 +++ b/libswscale/swscale.c Sat Aug 01 21:30:36 2009 +0000 @@ -2759,7 +2759,9 @@ || (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;