pngdec: Fix masks for interlaced decoding
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 19 Jan 2012 19:49:59 +0000 (20:49 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 21 Jan 2012 23:46:19 +0000 (00:46 +0100)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/png.c
libavcodec/pngdec.c

index 9b52496..ecca31e 100644 (file)
@@ -41,7 +41,7 @@ static const uint8_t ff_png_pass_xshift[NB_PASSES] = {
 
 /* Mask to determine which pixels are valid in a pass */
 const uint8_t ff_png_pass_mask[NB_PASSES] = {
-    0x80, 0x08, 0x88, 0x22, 0xaa, 0x55, 0xff
+    0x01, 0x01, 0x11, 0x11, 0x55, 0x55, 0xff,
 };
 
 void *ff_png_zalloc(void *opaque, unsigned int items, unsigned int size)
index 2b9f5ad..ec60454 100644 (file)
@@ -34,7 +34,7 @@
 
 /* Mask to determine which y pixels can be written in a pass */
 static const uint8_t png_pass_dsp_ymask[NB_PASSES] = {
-    0xff, 0xff, 0x0f, 0xcc, 0x33, 0xff, 0x55,
+    0xff, 0xff, 0x0f, 0xff, 0x33, 0xff, 0x55,
 };
 
 /* Mask to determine which pixels to overwrite while displaying */