Merge commit '07a844f32ebb78503981df017fa3ebfedb75fe1c'

[ffmpeg] / libswscale / slice.c

diff --git a/libswscale/slice.c b/libswscale/slice.c
index a7014872c4de4ab44bc6772ed79f66f9a91782ed..0159a739c38d3d76531c8a6b095d808ab76e8468 100644 (file)
--- a/libswscale/slice.c
+++ b/libswscale/slice.c
@@ -279,7 +279,7 @@ int ff_init_filters(SwsContext * c)
     if (need_lum_conv) {
         res = ff_init_desc_fmt_convert(&c->desc[index], &c->slice[srcIdx], &c->slice[dstIdx], pal);
         if (res < 0) goto cleanup;
-        c->desc[index].alpha = c->alpPixBuf != 0;
+        c->desc[index].alpha = c->needAlpha;
         ++index;
         srcIdx = dstIdx;
     }
@@ -288,7 +288,7 @@ int ff_init_filters(SwsContext * c)
     dstIdx = FFMAX(num_ydesc, num_cdesc);
     res = ff_init_desc_hscale(&c->desc[index], &c->slice[srcIdx], &c->slice[dstIdx], c->hLumFilter, c->hLumFilterPos, c->hLumFilterSize, c->lumXInc);
     if (res < 0) goto cleanup;
-    c->desc[index].alpha = c->alpPixBuf != 0;
+    c->desc[index].alpha = c->needAlpha;
 
 
     ++index;