Merge commit 'a7da517f6a5c472f46f67dd33bb6b95ccc919923'

[ffmpeg] / libswscale / vscale.c

diff --git a/libswscale/vscale.c b/libswscale/vscale.c
index 72f799de1a0b91167925eb0c65ff529eddd9ac27..72352dedb3ba177444df4d6ebc1889e67e0c1f7b 100644 (file)
--- a/libswscale/vscale.c
+++ b/libswscale/vscale.c
@@ -218,7 +218,7 @@ int ff_init_vscale(SwsContext *c, SwsFilterDescriptor *desc, SwsSlice *src, SwsS
         desc[0].instance = lumCtx;
         desc[0].src = src;
         desc[0].dst = dst;
-        desc[0].alpha = c->alpPixBuf != 0;
+        desc[0].alpha = c->needAlpha;
 
         if (!isGray(c->dstFormat)) {
             chrCtx = av_mallocz(sizeof(VScalerContext));
@@ -239,7 +239,7 @@ int ff_init_vscale(SwsContext *c, SwsFilterDescriptor *desc, SwsSlice *src, SwsS
         desc[0].instance = lumCtx;
         desc[0].src = src;
         desc[0].dst = dst;
-        desc[0].alpha = c->alpPixBuf != 0;
+        desc[0].alpha = c->needAlpha;
     }
 
     ff_init_vscale_pfn(c, c->yuv2plane1, c->yuv2planeX, c->yuv2nv12cX,