Log a warning rather than getting stuck when clamping XYZ values in RGB->XYZ conversi...

diff --git a/ChangeLog b/ChangeLog
index dc847ede15fac77a829fd1a4dd65afaba64f4111..531fb654cda72cb5cc99a4ac290ab7c69c65edb3 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,8 @@
 
        * Fix hang on audio analysis in some cases (#598).
 
+       * Fix never-ending encode when XYZ values are clamped (#600).
+
 2015-06-10  Carl Hetherington  <cth@carlh.net>
 
        * Version 2.0.50 released.

diff --git a/cscript b/cscript
index 9981f737fc29ff0d1ffb332d963e714a5e4ac51b..59b313cd3de947f3bea6963a2932ee5c6be3f7e7 100644 (file)
--- a/cscript
+++ b/cscript
@@ -224,7 +224,7 @@ def make_spec(filename, version, target):
 
 def dependencies(target):
     return (('ffmpeg-cdist', '0492ad2'),
-            ('libdcp', '41ab9a3'),
+            ('libdcp', 'e4d623e'),
             ('libsub', 'f66b11f'))
 
 def configure_options(target):

diff --git a/src/lib/dcp_video.cc b/src/lib/dcp_video.cc
index 69587a6fff6b127f6bb239e95d82da328469fe3c..806ec94642c0238afcd22428e27840551222b341 100644 (file)
--- a/src/lib/dcp_video.cc
+++ b/src/lib/dcp_video.cc
@@ -115,7 +115,8 @@ DCPVideo::encode_locally (dcp::NoteHandler note)
                        image->data()[0],
                        image->size(),
                        image->stride()[0],
-                       _frame->colour_conversion().get()
+                       _frame->colour_conversion().get(),
+                       note
                        );
        } else {
                xyz = dcp::xyz_to_xyz (image->data()[0], image->size(), image->stride()[0]);