1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-15 14:13:16 +02:00

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:01:28 +02:00

View File

@@ -397,6 +397,7 @@ version 0.10:
- ffwavesynth decoder - ffwavesynth decoder
- aviocat tool - aviocat tool
- ffeval tool - ffeval tool
- support decoding 4-channel SGI images
version 0.9: version 0.9: