Merge commit '4fee11ab05fc8569ef35c0ce86a60375c903eefb'
authorHendrik Leppkes <h.leppkes@gmail.com>
Wed, 5 Aug 2015 10:10:08 +0000 (12:10 +0200)
committerHendrik Leppkes <h.leppkes@gmail.com>
Wed, 5 Aug 2015 10:10:08 +0000 (12:10 +0200)
commit00b5c19661857c55b7a727f2f64fdf70cd0b553b
treef7e3b814bd62ac70daa8667bcbf7580f166c4917
parente5774f28d15887d36da25ae1ef2f1b3d7a75f449
parent4fee11ab05fc8569ef35c0ce86a60375c903eefb
Merge commit '4fee11ab05fc8569ef35c0ce86a60375c903eefb'

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

Conflicts:
libavcodec/pngdec.c

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