diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-04-01 04:01:28 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-04-01 04:03:31 +0200 |
| commit | 23290c86bfe6797da2865bfbd238588fe5398ca2 (patch) | |
| tree | 5f36f3d6440d99810ee88a9f6c53b4a8d78ef0d2 | |
| parent | 5628b9f5fb92a72fa35a46520cf6c4dc1942de25 (diff) | |
| parent | f8dea10d3f09376894613d0266c34d1a16ac735f (diff) | |
| download | ffmpeg-23290c86bfe6797da2865bfbd238588fe5398ca2.tar.gz | |
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>
| -rw-r--r-- | Changelog | 1 |
1 files changed, 1 insertions, 0 deletions
@@ -397,6 +397,7 @@ version 0.10: - ffwavesynth decoder - aviocat tool - ffeval tool +- support decoding 4-channel SGI images version 0.9: |