-
Michael Niedermayer authored
* commit 'c598b569': png: K&R formatting cosmetics Conflicts: libavcodec/png.c libavcodec/pngdec.c libavcodec/pngenc.c Merged-by:
Michael Niedermayer <michaelni@gmx.at>
a00d4c59
* commit 'c598b569': png: K&R formatting cosmetics Conflicts: libavcodec/png.c libavcodec/pngdec.c libavcodec/pngenc.c Merged-by:Michael Niedermayer <michaelni@gmx.at>