Merge master.

[dcpomatic.git] / ChangeLog

diff --git a/ChangeLog b/ChangeLog
index e9afa930235b1c1e610bb6f5d064de451c2a4911..6783464c64c2c89e1a601e383f08f9678ca723cc 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,15 @@
        * Fix KDM dialog to predictably set up its initial range to
        a week from now.
 
+       * Remove support for FFmpeg post-processing filters as they apparently
+       do not support > 8bpp.  I don't think they are worth the pain of
+       quantizing and then telling the user what has happened.
+
+2014-03-12  Carl Hetherington  <cth@carlh.net>
+
+       * Version 1.66.1 released.
+>>>>>>> 80faa28d7fd23ad811a9b837622f7e0cff1f2335
+
 2014-03-12  Carl Hetherington  <cth@carlh.net>
 
        * Hopefully fix i18n on OS X (#324).