[FFmpeg-cvslog] pngdec: dont treat mpng like png with key and non keyframes

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Jun  4 20:34:38 2013 +0200| [3b58ab4c5fdc31b7434b0c7608b48923edd63e3b] | committer: Michael Niedermayer

pngdec: dont treat mpng like png with key and non keyframes

Fixes Ticket2618

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

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

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

diff --git a/libavcodec/pngdec.c b/libavcodec/pngdec.c
index 8b33826..c1fc606 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