Merge remote-tracking branch 'cus/stable'

[ffmpeg] / Changelog

diff --git a/Changelog b/Changelog
index 1987bff486bdb6f61af9ca34db7c0c5f0afea064..99b7f0e80df6f88ee2523bdd9d4e04cc4c58c964 100644 (file)
--- a/Changelog
+++ b/Changelog
@@ -28,6 +28,9 @@ version next:
 - super2xsai filter ported from libmpcodecs
 - add libavresample audio conversion library for compatibility
 - MicroDVD decoder
+- Avid Meridien (AVUI) decoder
+- accept + prefix to -pix_fmt option to disable automatic conversions.
+- audio filters support in libavfilter and avconv
 
 
 version 0.10: