diff options
| author | Hendrik Leppkes <h.leppkes@gmail.com> | 2015-08-05 12:10:08 +0200 |
|---|---|---|
| committer | Hendrik Leppkes <h.leppkes@gmail.com> | 2015-08-05 12:10:08 +0200 |
| commit | 00b5c19661857c55b7a727f2f64fdf70cd0b553b (patch) | |
| tree | f7e3b814bd62ac70daa8667bcbf7580f166c4917 /libavcodec/pngdec.c | |
| parent | e5774f28d15887d36da25ae1ef2f1b3d7a75f449 (diff) | |
| parent | 4fee11ab05fc8569ef35c0ce86a60375c903eefb (diff) | |
| download | ffmpeg-00b5c19661857c55b7a727f2f64fdf70cd0b553b.tar.gz | |
Merge commit '4fee11ab05fc8569ef35c0ce86a60375c903eefb'
* commit '4fee11ab05fc8569ef35c0ce86a60375c903eefb':
png: Be more informative regarding signature errors
Conflicts:
libavcodec/pngdec.c
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
Diffstat (limited to 'libavcodec/pngdec.c')
| -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 7bba394290..6e7eae04fc 100644 --- a/libavcodec/pngdec.c +++ b/libavcodec/pngdec.c @@ -1171,7 +1171,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, "Invalid PNG signature (%d).\n", buf_size); + av_log(avctx, AV_LOG_ERROR, "Invalid PNG signature 0x%08"PRIX64".\n", sig); return AVERROR_INVALIDDATA; } |