Michael Niedermayer 47cc616864 Merge commit '6fd99e78def3c795bdd0bc31f3ae0998d24bc94c' ...

* commit '6fd99e78def3c795bdd0bc31f3ae0998d24bc94c':
  png: add a standalone parser

Conflicts:
	Changelog
	libavcodec/png_parser.c
	libavcodec/version.h

See: 2ee6dca3b8
Merged-by: Michael Niedermayer <michaelni@gmx.at>

2013-12-17 17:58:53 +01:00

3.6 KiB

Raw Blame History

View Raw