[FFmpeg-cvslog] pngdec: dont discard incomplete images.

Michael Niedermayer git at videolan.org
Tue Mar 20 13:58:31 CET 2012


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Mar 20 13:27:37 2012 +0100| [4ed47d335432e6416f9ee92aa0845d94451f9c6a] | committer: Michael Niedermayer

pngdec: dont discard incomplete images.

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

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

 libavcodec/pngdec.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/libavcodec/pngdec.c b/libavcodec/pngdec.c
index b818b02..c8d4758 100644
--- a/libavcodec/pngdec.c
+++ b/libavcodec/pngdec.c
@@ -594,7 +594,7 @@ static int decode_frame(AVCodecContext *avctx,
             }
             break;
         case MKTAG('I', 'E', 'N', 'D'):
-            if (!(s->state & PNG_ALLIMAGE)) {
+            if (!(s->state & (PNG_ALLIMAGE|PNG_IDAT))) {
                 av_log(avctx, AV_LOG_ERROR, "IEND without all image\n");
                 goto fail;
             }



More information about the ffmpeg-cvslog mailing list