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

[sdrik]

Author: sdrik
Date: Tue Mar 24 08:11:35 2009
New Revision: 29048

Log:
Adds "YUYV422 to YUVA420P" and "UYVY422 to YUVA420P" unscaled convertion

Modified:
   trunk/libswscale/swscale.c

Modified: trunk/libswscale/swscale.c
==============================================================================
--- trunk/libswscale/swscale.c	Tue Mar 24 08:10:19 2009	(r29047)
+++ trunk/libswscale/swscale.c	Tue Mar 24 08:11:35 2009	(r29048)
@@ -1885,6 +1885,9 @@ static int YUYV2YUV420Wrapper(SwsContext
 
     yuyvtoyuv420(ydst, udst, vdst, src[0], c->srcW, srcSliceH, dstStride[0], dstStride[1], srcStride[0]);
 
+    if (dstParam[3])
+        fillPlane(dstParam[3], dstStride[3], c->srcW, srcSliceH, srcSliceY, 255);
+
     return srcSliceH;
 }
 
@@ -1907,6 +1910,9 @@ static int UYVY2YUV420Wrapper(SwsContext
 
     uyvytoyuv420(ydst, udst, vdst, src[0], c->srcW, srcSliceH, dstStride[0], dstStride[1], srcStride[0]);
 
+    if (dstParam[3])
+        fillPlane(dstParam[3], dstStride[3], c->srcW, srcSliceH, srcSliceY, 255);
+
     return srcSliceH;
 }
 
@@ -2582,9 +2588,9 @@ SwsContext *sws_getContext(int srcW, int
                     c->swScale= PlanarToUyvyWrapper;
             }
         }
-        if(srcFormat == PIX_FMT_YUYV422 && dstFormat == PIX_FMT_YUV420P)
+        if(srcFormat == PIX_FMT_YUYV422 && (dstFormat == PIX_FMT_YUV420P || dstFormat == PIX_FMT_YUVA420P))
             c->swScale= YUYV2YUV420Wrapper;
-        if(srcFormat == PIX_FMT_UYVY422 && dstFormat == PIX_FMT_YUV420P)
+        if(srcFormat == PIX_FMT_UYVY422 && (dstFormat == PIX_FMT_YUV420P || dstFormat == PIX_FMT_YUVA420P))
             c->swScale= UYVY2YUV420Wrapper;
         if(srcFormat == PIX_FMT_YUYV422 && dstFormat == PIX_FMT_YUV422P)
             c->swScale= YUYV2YUV422Wrapper;