Merge remote-tracking branch 'newdev/master'

[ffmpeg] / Changelog

diff --git a/Changelog b/Changelog
index f05ba0d585a07dcc112b7924d1f43311ee4aeeda..c91faabfe68472603d553288286b2ecb64204653 100644 (file)
--- a/Changelog
+++ b/Changelog
@@ -69,7 +69,7 @@ version <next>:
 - replace the ocv_smooth filter with a more generic ocv filter
 - Windows Televison (WTV) demuxer
 - FFmpeg metadata format muxer and demuxer
-- SubRip (srt) subtitle decoder
+- SubRip (srt) subtitle encoder and decoder
 - floating-point AC-3 encoder added
 - Lagarith decoder
 - ffmpeg -copytb option added
@@ -79,6 +79,8 @@ version <next>:
 - Bink version 'b' audio and video decoder
 - Bitmap Brothers JV playback system
 - Linux framebuffer input device added
+- Apple HTTP Live Streaming protocol handler
+- sndio support for playback and record
 
 
 version 0.6: