Merge.
authorCarl Hetherington <cth@carlh.net>
Tue, 6 Oct 2015 15:31:35 +0000 (16:31 +0100)
committerCarl Hetherington <cth@carlh.net>
Tue, 6 Oct 2015 15:31:35 +0000 (16:31 +0100)
1  2 
ChangeLog

diff --cc ChangeLog
index da4b2a8fd45f9d496e7d00f90e64b3cf50243afd,262107c6daafb097cf452aed1765459466bbcfb3..6880b0d0d614bc02867ba0669137930b55c955ee
+++ b/ChangeLog
@@@ -1,11 -1,9 +1,15 @@@
  2015-10-06  Carl Hetherington  <cth@carlh.net>
  
 +      * Fix subtitle timing when the DCP rate
 +      is different to their native rate.
 +
 +      * Fix invalid SMPTE subtitle output
 +      in some cases.
 +
+       * Version 2.4.1 released.
+ 2015-10-06  Carl Hetherington  <cth@carlh.net>
        * Speculative support for multi-part
        bitmap subtitles (#709).