diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-03-11 13:57:52 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-03-11 13:57:55 +0100 |
| commit | 52b6db848d41ee811b9368a3df8918f7310bed31 (patch) | |
| tree | 760d7f4626f2b922e18ddd25d461cca73f522972 | |
| parent | 61f96be08a66e74897406fd64da4e61ea4b6a8c5 (diff) | |
| parent | 666749f6694510764253ed5602ed5d1cdcfb243f (diff) | |
| download | ffmpeg-52b6db848d41ee811b9368a3df8918f7310bed31.tar.gz | |
Merge remote-tracking branch 'cehoyos/master'
* cehoyos/master:
Decode png images without iend chunk.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavcodec/pngdec.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/libavcodec/pngdec.c b/libavcodec/pngdec.c index 516dd41f0c..985517d88d 100644 --- a/libavcodec/pngdec.c +++ b/libavcodec/pngdec.c @@ -546,6 +546,9 @@ static int decode_frame(AVCodecContext *avctx, for (;;) { if (bytestream2_get_bytes_left(&s->gb) <= 0) { av_log(avctx, AV_LOG_ERROR, "No bytes left\n"); + if ( s->state & PNG_ALLIMAGE + && avctx->strict_std_compliance <= FF_COMPLIANCE_NORMAL) + goto exit_loop; goto fail; } |