[FFmpeg-cvslog] Merge commit '4fee11ab05fc8569ef35c0ce86a60375c903eefb'

Hendrik Leppkes git at videolan.org
Wed Aug 5 12:10:56 CEST 2015


ffmpeg | branch: master | Hendrik Leppkes <h.leppkes at gmail.com> | Wed Aug  5 12:10:08 2015 +0200| [00b5c19661857c55b7a727f2f64fdf70cd0b553b] | committer: Hendrik Leppkes

Merge commit '4fee11ab05fc8569ef35c0ce86a60375c903eefb'

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

Conflicts:
	libavcodec/pngdec.c

Merged-by: Hendrik Leppkes <h.leppkes at gmail.com>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=00b5c19661857c55b7a727f2f64fdf70cd0b553b
---





More information about the ffmpeg-cvslog mailing list