merge sbox with mix on the encryption side

[ffmpeg] / Changelog

diff --git a/Changelog b/Changelog
index c8acd2a712f4ce34c160aaa825249379d3a10f64..c4943222a48ebbe0826419d8152c861844c0228e 100644 (file)
--- a/Changelog
+++ b/Changelog
@@ -19,7 +19,7 @@ version <next>
 - Fraps FPS1 video decoder
 - Snow video encoder/decoder
 - Sonic audio encoder/decoder
-- Vorbis audio decoder
+- Vorbis audio encoder/decoder
 - Macromedia ADPCM decoder
 - Duck TrueMotion 2 video decoder
 - support for decoding FLX and DTA extensions in FLIC files
@@ -38,7 +38,7 @@ version <next>
 - ADTS AAC file reading and writing
 - Creative VOC file reading and writing
 - American Laser Games multimedia (*.mm) playback system
-- Zip Blocks Motion Video decoder
+- Zip Blocks Motion Video decoder and encoder
 - Improved Theora/VP3 decoder
 - True Audio (TTA) decoder
 - AVS demuxer and video decoder
@@ -59,6 +59,14 @@ version <next>
 - VP5 video decoder
 - VP6 video decoder
 - WavPack lossless audio decoder
+- Targa (.TGA) picture decoder
+- Delphine Software .cin demuxer/audio and video decoder
+- Tiertex .seq demuxer/video decoder
+- MTV demuxer
+- TIFF picture decoder
+- GIF picture decoder
+- Intel Music decoder
+- Musepack decoder
 
 version 0.4.9-pre1: