summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-06-04 20:34:38 +0200
committerMichael Niedermayer <michaelni@gmx.at>2013-06-04 20:40:07 +0200
commit3b58ab4c5fdc31b7434b0c7608b48923edd63e3b (patch)
treeccf5146a0ec66cb8032058acfa8bb0bdff0ab4fb
parent3b491c5a5002f33288a0e8e91ca3a704b225bd4e (diff)
pngdec: dont treat mpng like png with key and non keyframes
Fixes Ticket2618 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
-rw-r--r--libavcodec/pngdec.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/pngdec.c b/libavcodec/pngdec.c
index 8b33826176..c1fc60666e 100644
--- a/libavcodec/pngdec.c
+++ b/libavcodec/pngdec.c
@@ -821,7 +821,7 @@ static int decode_frame(AVCodecContext *avctx,
/* handle p-frames only if a predecessor frame is available */
if (s->prev->data[0]) {
- if ( !(avpkt->flags & AV_PKT_FLAG_KEY)
+ if ( !(avpkt->flags & AV_PKT_FLAG_KEY) && avctx->codec_tag != AV_RL32("MPNG")
&& s->prev->width == p->width
&& s->prev->height== p->height
&& s->prev->format== p->format