Merge commit '4fee11ab'

* commit '4fee11ab':
  png: Be more informative regarding signature errors

Conflicts:
	libavcodec/pngdec.c
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>

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;
     }