diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-03-11 13:57:52 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-03-11 13:57:55 +0100 |
| commit | 52b6db848d41ee811b9368a3df8918f7310bed31 (patch) | |
| tree | 760d7f4626f2b922e18ddd25d461cca73f522972 /version.sh | |
| parent | 61f96be08a66e74897406fd64da4e61ea4b6a8c5 (diff) | |
| parent | 666749f6694510764253ed5602ed5d1cdcfb243f (diff) | |
| download | ffmpeg-52b6db848d41ee811b9368a3df8918f7310bed31.tar.gz | |
Merge remote-tracking branch 'cehoyos/master'
* cehoyos/master:
Decode png images without iend chunk.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'version.sh')
0 files changed, 0 insertions, 0 deletions