Merge commit 'b8b809908ec547b2609dbac24194f4fd2df61aea'

[ffmpeg] / libavcodec / pngdec.c

diff --git a/libavcodec/pngdec.c b/libavcodec/pngdec.c
index 8b33826176afc220371e5f508ff4a5086d53c9b0..c1fc60666e60e2df91f4fca845d72189abe53d4a 100644 (file)
--- 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