Merge commit '302ca6b20ed01ac584f5b15d5bca3d3a92b7a77a'

[ffmpeg] / Changelog

diff --git a/Changelog b/Changelog
index 04f17281c3e3f11123b2ee95e5fa494566fed43e..135cd65a7167d48c5d058c0073cfa5aa25e4d204 100644 (file)
--- a/Changelog
+++ b/Changelog
@@ -16,6 +16,8 @@ version <next>:
 - Closed caption Decoder
 - fspp, uspp, pp7 MPlayer postprocessing filters ported to native filters
 - showpalette filter
+- Twofish symmetric block cipher
+- Support DNx100 (960x720@8)
 
 
 version 2.5: