diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-01-15 02:52:47 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-01-15 02:54:04 +0100 |
| commit | cd960c8a4f7cd78e3f7d13f78bdf01a5b8136dff (patch) | |
| tree | d3853a208906945de903b9f53eaa2f1f8bdf5c12 | |
| parent | 140dfd14fdab67daf9f067509b09a667cbf788d4 (diff) | |
| parent | 1e763454322f7fbc7799f6009bf2e11d7a3b9821 (diff) | |
| download | ffmpeg-cd960c8a4f7cd78e3f7d13f78bdf01a5b8136dff.tar.gz | |
Merge commit '1e763454322f7fbc7799f6009bf2e11d7a3b9821'
* commit '1e763454322f7fbc7799f6009bf2e11d7a3b9821':
png: improve signature check
Conflicts:
libavcodec/pngdec.c
See: 8a08503b78f59d61cf98b9deb99363e3e07d8599
See: 0a3589bf2f0a23b0eb68664fbb00078abe882a88
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavcodec/pngdec.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/pngdec.c b/libavcodec/pngdec.c index 297e631ff5..901abaebd3 100644 --- a/libavcodec/pngdec.c +++ b/libavcodec/pngdec.c @@ -1118,7 +1118,7 @@ static int decode_frame_png(AVCodecContext *avctx, sig = bytestream2_get_be64(&s->gb); if (sig != PNGSIG && sig != MNGSIG) { - av_log(avctx, AV_LOG_ERROR, "Missing png signature\n"); + av_log(avctx, AV_LOG_ERROR, "Invalid PNG signature (%d).\n", buf_size); return AVERROR_INVALIDDATA; } |