aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michael@niedermayer.cc>2016-04-09 00:47:10 +0200
committerMichael Niedermayer <michael@niedermayer.cc>2016-04-09 01:12:32 +0200
commit325d0b64d5a43925adb81daa3a86a25dbb7d58fe (patch)
tree4539e1b43bd8a056b8189ecc4e4df3bf527d74e9
parent6103a8453fadf53f87fe4198db41cb6a5a7420dc (diff)
downloadffmpeg-325d0b64d5a43925adb81daa3a86a25dbb7d58fe.tar.gz
avcodec/pngdec: Fix alpha detection with skip_frame
Fixes Ticket4816 Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> (cherry picked from commit d433623fba2b273491ff7dda401648e7d07e19fe) Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
-rw-r--r--libavcodec/pngdec.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/libavcodec/pngdec.c b/libavcodec/pngdec.c
index 61857d0e5c..24318fbeaf 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;