# HG changeset patch # User reimar # Date 1230809626 0 # Node ID 06dbef90389e4c27e78b7b49f2cac3a75790ed83 # Parent 54c35115639c32161749d3a8e90cabd758fa16aa Simplify and comment spudec bilinear scaling code diff -r 54c35115639c -r 06dbef90389e spudec.c --- a/spudec.c Thu Jan 01 11:23:32 2009 +0000 +++ b/spudec.c Thu Jan 01 11:33:46 2009 +0000 @@ -737,9 +737,10 @@ spu->scaled_image[scaled] = (color[0] * scale[0] + color[1] * scale[1] + color[2] * scale[2] + color[3] * scale[3])>>24; spu->scaled_aimage[scaled] = (scale[0] + scale[1] + scale[2] + scale[3]) >> 16; if (spu->scaled_aimage[scaled]){ - spu->scaled_aimage[scaled] = 256 - spu->scaled_aimage[scaled]; - if(spu->scaled_aimage[scaled] + spu->scaled_image[scaled] > 255) - spu->scaled_image[scaled] = 256 - spu->scaled_aimage[scaled]; + // ensure that MPlayer's simplified alpha-blending can not overflow + spu->scaled_image[scaled] = FFMIN(spu->scaled_image[scaled], spu->scaled_aimage[scaled]); + // convert to MPlayer-style alpha + spu->scaled_aimage[scaled] = -spu->scaled_aimage[scaled]; } }