From dcabb3d6081b129c1abcfa04e428fda6a510ffa6 Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Tue, 6 Sep 2011 18:46:42 +0200 Subject: [PATCH] pngdec: implement 2 bpp interlaced. Fixes Ticket434 Signed-off-by: Michael Niedermayer --- libavcodec/pngdec.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/libavcodec/pngdec.c b/libavcodec/pngdec.c index 5abdb90dee..245d39bac4 100644 --- a/libavcodec/pngdec.c +++ b/libavcodec/pngdec.c @@ -69,6 +69,20 @@ static void png_put_interlaced_row(uint8_t *dst, int width, src_x++; } break; + case 2: + src_x = 0; + for(x = 0; x < width; x++) { + int j2 = 2*(x&3); + j = (x & 7); + if ((dsp_mask << j) & 0x80) { + b = (src[src_x >> 2] >> (6 - 2*(src_x & 3))) & 3; + dst[x >> 2] &= 0xFF3F>>j2; + dst[x >> 2] |= b << (6 - j2); + } + if ((mask << j) & 0x80) + src_x++; + } + break; default: bpp = bits_per_pixel >> 3; d = dst;