[FFmpeg-cvslog] Merge commit '92a36a6b3338df5f5cff573a486e182005367c24'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Aug  1 16:48:09 2014 +0200| [5727d387fb244aa754847494e199ab3b4e084266] | committer: Michael Niedermayer

Merge commit '92a36a6b3338df5f5cff573a486e182005367c24'

* commit '92a36a6b3338df5f5cff573a486e182005367c24':
  pngdec: correctly indent macros

Conflicts:
	libavcodec/pngdec.c

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

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=5727d387fb244aa754847494e199ab3b4e084266
---