summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog2
-rw-r--r--cscript2
-rw-r--r--src/lib/dcp_video.cc3
3 files changed, 5 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index dc847ede1..531fb654c 100644
--- 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 9981f737f..59b313cd3 100644
--- 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 69587a6ff..806ec9464 100644
--- 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]);