[FFmpeg-cvslog] Merge commit 'e64f0bf2d2b1347ec9461f0e82852a62e8c6ffbe'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Aug  4 22:37:17 2014 +0200| [59412e3a0703222c8bc995a7deb883327b7a9c03] | committer: Michael Niedermayer

Merge commit 'e64f0bf2d2b1347ec9461f0e82852a62e8c6ffbe'

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

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

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