summaryrefslogtreecommitdiffstats
path: root/Changelog
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-04-01 04:09:22 +0200
committerMichael Niedermayer <michaelni@gmx.at>2014-04-01 04:13:53 +0200
commit4ebfcd62af117ed7f343a0e52709a6409e0913f4 (patch)
tree183b748b2cd55a24651a0741b5e18ea7768e5c60 /Changelog
parent23290c86bfe6797da2865bfbd238588fe5398ca2 (diff)
parent6c1df1f2287401b6022773e382ebc3a3bfed0b38 (diff)
downloadffmpeg-streaming-4ebfcd62af117ed7f343a0e52709a6409e0913f4.zip
ffmpeg-streaming-4ebfcd62af117ed7f343a0e52709a6409e0913f4.tar.gz
Merge commit '6c1df1f2287401b6022773e382ebc3a3bfed0b38'
* commit '6c1df1f2287401b6022773e382ebc3a3bfed0b38': sgi: encode images with 4 channels at 8 and 16 bits Conflicts: Changelog libavcodec/sgienc.c See: 21a100610977a163fe6480b5cf4c25f34f64b86b Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'Changelog')
-rw-r--r--Changelog2
1 files changed, 1 insertions, 1 deletions
diff --git a/Changelog b/Changelog
index 85374f3..a820449 100644
--- a/Changelog
+++ b/Changelog
@@ -397,7 +397,7 @@ version 0.10:
- ffwavesynth decoder
- aviocat tool
- ffeval tool
-- support decoding 4-channel SGI images
+- support encoding and decoding 4-channel SGI images
version 0.9:
OpenPOWER on IntegriCloud