Merge remote-tracking branch 'qatar/master'

[ffmpeg] / Changelog

diff --git a/Changelog b/Changelog
index b1dc7fa53f8bdda41da6476b69ae56ae2138258b..79a8f4ce9b6e3ffa777cec3ddf93bd85fec2a10c 100644 (file)
--- a/Changelog
+++ b/Changelog
@@ -12,8 +12,32 @@ version next:
 - RTMPT protocol support
 - iLBC encoding/decoding via libilbc
 - Microsoft Screen 1 decoder
+- join audio filter
+- audio channel mapping filter
+- Microsoft ATC Screen decoder
+- RTSP listen mode
+- TechSmith Screen Codec 2 decoder
+- AAC encoding via libfdk-aac
+- Microsoft Expression Encoder Screen decoder
+- RTMPS protocol support
+- RTMPTS protocol support
+- RTMPE protocol support
+- RTMPTE protocol support
 - showwaves filter
 - LucasArts SMUSH playback support
+- SAMI, RealText and SubViewer demuxers and decoders
+- Heart Of Darkness PAF playback support
+- iec61883 device
+- asettb filter
+- new option: -progress
+- 3GPP Timed Text decoder
+- GeoTIFF decoder support
+- ffmpeg -(no)stdin option
+- Opus decoder using libopus
+- caca output device using libcaca
+- alphaextract and alphamerge filters
+- concat filter
+- flite filter
 
 
 version 0.11: