aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2012-01-19 20:49:59 +0100
committerMichael Niedermayer <michaelni@gmx.at>2012-01-22 00:46:19 +0100
commitfd8a8373aa52e94de14f0583c482c8faa95dd677 (patch)
tree274ae6e8d4b3447adf70abec44f233fb4af3bfec
parent602e97dfaa8a0aaa41b3749b7cb2c7c900ed7aee (diff)
downloadffmpeg-fd8a8373aa52e94de14f0583c482c8faa95dd677.tar.gz
pngdec: Fix masks for interlaced decoding
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
-rw-r--r--libavcodec/png.c2
-rw-r--r--libavcodec/pngdec.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/png.c b/libavcodec/png.c
index 9b52496685..ecca31e960 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 2b9f5adaeb..ec604546b1 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 */