Merge commit '6fd99e78def3c795bdd0bc31f3ae0998d24bc94c'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 17 Dec 2013 16:58:06 +0000 (17:58 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 17 Dec 2013 16:58:53 +0000 (17:58 +0100)
commit47cc6168649485837b1e4fdd5f33f16c275933bd
tree2b79b9d31fc0bb8cece748cb595564bc1eb13cfe
parentc90f31146e8b1407a4a5808d0d904d85baeed5d4
parent6fd99e78def3c795bdd0bc31f3ae0998d24bc94c
Merge commit '6fd99e78def3c795bdd0bc31f3ae0998d24bc94c'

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

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

See: 2ee6dca3b8f40132be5c8b77e3700a9e3f26c382
Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/Makefile
libavcodec/png_parser.c
libavcodec/version.h