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)
* 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

index 0865d05..85374f3 100644 (file)
--- 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: