Merge commit 'f8dea10d'

* commit 'f8dea10d': sgi: decode images with 4 channels at 8 and 16 bits Conflicts: Changelog See: 0b1f20e2Merged-by: Michael Niedermayer <michaelni@gmx.at>

Merge commit 'f8dea10d'
* commit 'f8dea10d': sgi: decode images with 4 channels at 8 and 16 bits Conflicts: Changelog See: 0b1f20e2Merged-by: Michael Niedermayer <michaelni@gmx.at>
23290c86 · Michael Niedermayer · 5628b9f5 · f8dea10d · 23290c86
Commit 23290c86 authored Apr 01, 2014 by Michael Niedermayer
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 0 deletions

Changelog Changelog +1 -0

No files found.
--- a/Changelog
+++ b/Changelog
@@ -397,6 +397,7 @@ version 0.10:
 - ffwavesynth decoder
 - aviocat tool
 - ffeval tool
+- support decoding 4-channel SGI images
 version 0.9: