Michael Niedermayer a00d4c5956 Merge commit 'c598b569fb3d1f4b6c4868fe64f6989254df5186' ...

* commit 'c598b569fb3d1f4b6c4868fe64f6989254df5186':
  png: K&R formatting cosmetics

Conflicts:
	libavcodec/png.c
	libavcodec/pngdec.c
	libavcodec/pngenc.c

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

2014-03-17 15:29:42 +01:00

1.7 KiB

Raw Blame History

View Raw