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>
11 years ago · 23290c86bf
parent 5628b9f5fb f8dea10d3f
commit 23290c86bf
1 changed files with 1 additions and 0 deletions
--- a/1
+++ b/1
@ -397,6 +397,7 @@ version 0.10:
 - ffwavesynth decoder
 - aviocat tool
 - ffeval tool
+- support decoding 4-channel SGI images


 version 0.9: