Merge remote-tracking branch 'cus/stable'

[ffmpeg] / Changelog

diff --git a/Changelog b/Changelog
index e0584b7a9b1647a072e9174157cc3e66f0da3b48..99b7f0e80df6f88ee2523bdd9d4e04cc4c58c964 100644 (file)
--- a/Changelog
+++ b/Changelog
@@ -26,6 +26,11 @@ version next:
 - drawtext video filter: fontconfig support
 - ffmpeg -benchmark_all option
 - 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: