Fix merge.

[dcpomatic.git] / ChangeLog

diff --git a/ChangeLog b/ChangeLog
index 897e1f0f70d09dedad41ef28c509ef0684874c3a..a98e4ffc00a775e8b8c938bc1af0c131fa41eb07 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,8 @@
        * Store time zone with cinemas and use them to
        mark KDM start and end times correctly (#788).
 
+       * Bump ffmpeg to git master, somewhere post 3.0.
+
 2016-03-08  Carl Hetherington  <cth@carlh.net>
 
        * Version 2.7.0 released.