[FFmpeg-cvslog] pngenc: Fix incorrect mask used for interlaced mode.

Michael Niedermayer git at videolan.org
Mon Apr 9 18:46:48 CEST 2012


ffmpeg | branch: release/0.7 | Michael Niedermayer <michaelni at gmx.at> | Tue Mar 20 20:39:32 2012 +0100| [c9d12a4692e8a39c8817483d522ffbfd88c4e073] | committer: Michael Niedermayer

pngenc: Fix incorrect mask used for interlaced mode.

Fixes Ticket1109

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit 15db6a959057b92245a384909ec7d413d5c16461)

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=c9d12a4692e8a39c8817483d522ffbfd88c4e073
---

 libavcodec/pngenc.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/libavcodec/pngenc.c b/libavcodec/pngenc.c
index c4ef2fd..5812cda 100644
--- a/libavcodec/pngenc.c
+++ b/libavcodec/pngenc.c
@@ -55,7 +55,7 @@ static void png_get_interlaced_row(uint8_t *dst, int row_size,
     uint8_t *d;
     const uint8_t *s;
 
-    mask = ff_png_pass_mask[pass];
+    mask =  (int[]){0x80, 0x08, 0x88, 0x22, 0xaa, 0x55, 0xff}[pass];
     switch(bits_per_pixel) {
     case 1:
         memset(dst, 0, row_size);



More information about the ffmpeg-cvslog mailing list