Merge remote-tracking branch 'cehoyos/master'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 11 Mar 2014 12:57:52 +0000 (13:57 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 11 Mar 2014 12:57:55 +0000 (13:57 +0100)
* cehoyos/master:
  Decode png images without iend chunk.

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

Trivial merge