From 6de58b49032a206985602effec91e5e46c886ea2 Mon Sep 17 00:00:00 2001 From: Pedro Arthur Date: Mon, 28 Mar 2016 13:25:18 -0300 Subject: swscale: cleanup unused code Removed previous swscale code under '#ifndef NEW_FILTER' and removed unused fields of SwsContext --- libswscale/slice.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'libswscale/slice.c') diff --git a/libswscale/slice.c b/libswscale/slice.c index a701487..0159a73 100644 --- 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; -- cgit v1.1