[FFmpeg-devel] [PATCH 2/3] pngdec: Fix masks for interlaced decoding

Michael Niedermayer michaelni at gmx.at
Thu Jan 19 20:55:43 CET 2012


Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
---
 libavcodec/png.c    |    2 +-
 libavcodec/pngdec.c |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/libavcodec/png.c b/libavcodec/png.c
index 9b52496..ecca31e 100644
--- a/libavcodec/png.c
+++ b/libavcodec/png.c
@@ -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)
diff --git a/libavcodec/pngdec.c b/libavcodec/pngdec.c
index e28a27a..1913f51 100644
--- a/libavcodec/pngdec.c
+++ b/libavcodec/pngdec.c
@@ -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 */
-- 
1.7.5.4



More information about the ffmpeg-devel mailing list