Merge commit '92a36a6b3338df5f5cff573a486e182005367c24'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 1 Aug 2014 14:48:09 +0000 (16:48 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 1 Aug 2014 14:48:09 +0000 (16:48 +0200)
commit5727d387fb244aa754847494e199ab3b4e084266
treed43afa6de47785e7ec8e1d427f57619970574dcc
parentc87f645a757e1888932a57a2b5ef8ca44098a9e0
parent92a36a6b3338df5f5cff573a486e182005367c24
Merge commit '92a36a6b3338df5f5cff573a486e182005367c24'

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

Conflicts:
libavcodec/pngdec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/pngdec.c