Merge commit 'f8dea10d3f09376894613d0266c34d1a16ac735f'

* commit 'f8dea10d3f09376894613d0266c34d1a16ac735f':
  sgi: decode images with 4 channels at 8 and 16 bits

Conflicts:
	Changelog

See: 0b1f20e23c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer
2014-04-01 04:03:31 +02:00
+1
View File
@@ -397,6 +397,7 @@ version 0.10:
- ffwavesynth decoder
- aviocat tool
- ffeval tool
- support decoding 4-channel SGI images
version 0.9: