Merge remote-tracking branch 'qatar/master'

[ffmpeg] / Changelog

diff --git a/Changelog b/Changelog
index 44e647f3b6ec0d58b7c7f6ccfd11796ea0dffb16..79a8f4ce9b6e3ffa777cec3ddf93bd85fec2a10c 100644 (file)
--- a/Changelog
+++ b/Changelog
@@ -21,10 +21,11 @@ version next:
 - Microsoft Expression Encoder Screen decoder
 - RTMPS protocol support
 - RTMPTS protocol support
+- RTMPE protocol support
+- RTMPTE protocol support
 - showwaves filter
 - LucasArts SMUSH playback support
-- SAMI demuxer and decoder
-- RealText demuxer and decoder
+- SAMI, RealText and SubViewer demuxers and decoders
 - Heart Of Darkness PAF playback support
 - iec61883 device
 - asettb filter
@@ -35,6 +36,8 @@ version next:
 - Opus decoder using libopus
 - caca output device using libcaca
 - alphaextract and alphamerge filters
+- concat filter
+- flite filter
 
 
 version 0.11: