ffmpeg | branch: release/3.0 | Michael Niedermayer <mich...@niedermayer.cc> | 
Sat Apr  9 00:47:10 2016 +0200| [325d0b64d5a43925adb81daa3a86a25dbb7d58fe] | 
committer: Michael Niedermayer

avcodec/pngdec: Fix alpha detection with skip_frame

Fixes Ticket4816

Signed-off-by: Michael Niedermayer <mich...@niedermayer.cc>
(cherry picked from commit d433623fba2b273491ff7dda401648e7d07e19fe)

Signed-off-by: Michael Niedermayer <mich...@niedermayer.cc>

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

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

diff --git a/libavcodec/pngdec.c b/libavcodec/pngdec.c
index 61857d0..24318fb 100644
--- a/libavcodec/pngdec.c
+++ b/libavcodec/pngdec.c
@@ -1136,6 +1136,7 @@ static int decode_frame_common(AVCodecContext *avctx, 
PNGDecContext *s,
             case MKTAG('p', 'H', 'Y', 's'):
             case MKTAG('t', 'E', 'X', 't'):
             case MKTAG('I', 'D', 'A', 'T'):
+            case MKTAG('t', 'R', 'N', 'S'):
                 break;
             default:
                 goto skip_tag;

_______________________________________________
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

Reply via email to