-
Michael Niedermayer authored
* commit '6fd99e78': png: add a standalone parser Conflicts: Changelog libavcodec/png_parser.c libavcodec/version.h See: 2ee6dca3Merged-by: Michael Niedermayer <michaelni@gmx.at>
47cc6168
* commit '6fd99e78': png: add a standalone parser Conflicts: Changelog libavcodec/png_parser.c libavcodec/version.h See: 2ee6dca3Merged-by: Michael Niedermayer <michaelni@gmx.at>