-
Michael Niedermayer authored
* commit '1e763454': png: improve signature check Conflicts: libavcodec/pngdec.c See: 8a08503b See: 0a3589bfMerged-by: Michael Niedermayer <michaelni@gmx.at>
cd960c8a
* commit '1e763454': png: improve signature check Conflicts: libavcodec/pngdec.c See: 8a08503b See: 0a3589bfMerged-by: Michael Niedermayer <michaelni@gmx.at>