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)
commit52b6db848d41ee811b9368a3df8918f7310bed31
tree760d7f4626f2b922e18ddd25d461cca73f522972
parent61f96be08a66e74897406fd64da4e61ea4b6a8c5
parent666749f6694510764253ed5602ed5d1cdcfb243f
Merge remote-tracking branch 'cehoyos/master'

* cehoyos/master:
  Decode png images without iend chunk.

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