Merge commit 'f8dea10d3f09376894613d0266c34d1a16ac735f'
* commit 'f8dea10d3f09376894613d0266c34d1a16ac735f': sgi: decode images with 4 channels at 8 and 16 bits Conflicts: Changelog See: 0b1f20e23c3d61d06c86ee1aa160cd4da8b47b0c Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
commit
23290c86bf