[FFmpeg-cvslog] avcodec/pngdec: reset has_trns after every decode_frame_png()

Paul B Mahol git at videolan.org
Fri Oct 9 21:18:52 CEST 2015


ffmpeg | branch: release/2.8 | Paul B Mahol <onemda at gmail.com> | Mon Sep 28 20:53:01 2015 +0200| [39df4d24751d89af749e79f5839b341ad7931751] | committer: Carl Eugen Hoyos

avcodec/pngdec: reset has_trns after every decode_frame_png()

Fixes #4887.

Signed-off-by: Paul B Mahol <onemda at gmail.com>
(cherry picked from commit 1d0487f77f07663c510207eb6e946675b71823cb)

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

 libavcodec/pngdec.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavcodec/pngdec.c b/libavcodec/pngdec.c
index ee11f12..1b47b18 100644
--- a/libavcodec/pngdec.c
+++ b/libavcodec/pngdec.c
@@ -1254,7 +1254,7 @@ static int decode_frame_png(AVCodecContext *avctx,
         return AVERROR_INVALIDDATA;
     }
 
-    s->y = s->state = 0;
+    s->y = s->state = s->has_trns = 0;
 
     /* init the zlib */
     s->zstream.zalloc = ff_png_zalloc;



More information about the ffmpeg-cvslog mailing list