Reflect the 0.6 branch in the Changelog.

Originally committed as revision 23270 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/Changelog b/Changelog
index c3ea45b434cdb72209a3178031e70bb09a647df9..f7f4c800c49a033bda2bd887658a527c678ea881 100644 (file)
--- a/Changelog
+++ b/Changelog
@@ -4,6 +4,12 @@ releases are sorted from youngest to oldest.
 
 version <next>:
 
+- WebM support in Matroska demuxer
+
+
+
+version 0.6:
+
 - PB-frame decoding for H.263
 - deprecated vhook subsystem removed
 - deprecated old scaler removed
@@ -71,7 +77,6 @@ version <next>:
 - spectral extension support in the E-AC-3 decoder
 - unsharp video filter
 - RTP hinting in the mov/3gp/mp4 muxer
-- WebM support in Matroska demuxer