Merge commit 'f8dea10d3f09376894613d0266c34d1a16ac735f'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 1 Apr 2014 02:01:28 +0000 (04:01 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 1 Apr 2014 02:03:31 +0000 (04:03 +0200)
commit23290c86bfe6797da2865bfbd238588fe5398ca2
tree5f36f3d6440d99810ee88a9f6c53b4a8d78ef0d2
parent5628b9f5fb92a72fa35a46520cf6c4dc1942de25
parentf8dea10d3f09376894613d0266c34d1a16ac735f
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>
Changelog