Merge commit 'e64f0bf2d2b1347ec9461f0e82852a62e8c6ffbe'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 4 Aug 2014 20:37:17 +0000 (22:37 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 4 Aug 2014 20:38:12 +0000 (22:38 +0200)
commit59412e3a0703222c8bc995a7deb883327b7a9c03
treef641754c62b6a30a70c4f3d05a1f036e5be2f666
parente1795bc380896701dfbbf904a8089154aff04746
parente64f0bf2d2b1347ec9461f0e82852a62e8c6ffbe
Merge commit 'e64f0bf2d2b1347ec9461f0e82852a62e8c6ffbe'

* commit 'e64f0bf2d2b1347ec9461f0e82852a62e8c6ffbe':
  png: support reading gray+alpha at 16 bits

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