Merge commit 'c598b569fb3d1f4b6c4868fe64f6989254df5186'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 17 Mar 2014 14:24:05 +0000 (15:24 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 17 Mar 2014 14:29:42 +0000 (15:29 +0100)
commita00d4c5956e178296c31a631679618be4910ba5a
treedd8c4ae7365165403d572b50aefa8f916e968688
parentb361a0bf1fbbfa3d090e6d8db5aca6cbed8260b3
parentc598b569fb3d1f4b6c4868fe64f6989254df5186
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>
libavcodec/png.c
libavcodec/pngdec.c
libavcodec/pngdsp.c
libavcodec/pngenc.c