[FFmpeg-cvslog] pngdec: Fix interlaced 1bpp
Michael Niedermayer
git at videolan.org
Tue Sep 6 15:35:35 CEST 2011
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Sep 6 15:28:36 2011 +0200| [dc43ad6d1a857229bb71e755a44a9765321908e1] | committer: Michael Niedermayer
pngdec: Fix interlaced 1bpp
Fixes Ticket214
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=dc43ad6d1a857229bb71e755a44a9765321908e1
---
libavcodec/pngdec.c | 4 +---
1 files changed, 1 insertions(+), 3 deletions(-)
diff --git a/libavcodec/pngdec.c b/libavcodec/pngdec.c
index 0b6a62d..7ac20ae 100644
--- a/libavcodec/pngdec.c
+++ b/libavcodec/pngdec.c
@@ -57,14 +57,12 @@ static void png_put_interlaced_row(uint8_t *dst, int width,
dsp_mask = png_pass_dsp_mask[pass];
switch(bits_per_pixel) {
case 1:
- /* we must initialize the line to zero before writing to it */
- if (pass == 0)
- memset(dst, 0, (width + 7) >> 3);
src_x = 0;
for(x = 0; x < width; x++) {
j = (x & 7);
if ((dsp_mask << j) & 0x80) {
b = (src[src_x >> 3] >> (7 - (src_x & 7))) & 1;
+ dst[x >> 3] &= 0xFF7F>>j;
dst[x >> 3] |= b << (7 - j);
}
if ((mask << j) & 0x80)
More information about the ffmpeg-cvslog
mailing list