diff options
| author | Carl Hetherington <cth@carlh.net> | 2015-02-10 15:39:37 +0000 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2015-02-10 15:39:37 +0000 |
| commit | 35466aa2bf59544d436a5f576e81856c5e0d0311 (patch) | |
| tree | dcc142e196a859aa28d99110b2f5f5b54a18ba42 /src/lib/video_content.cc | |
| parent | fec9cf2d1fb02d9a2f563cbe8e3de6cd479b35f2 (diff) | |
Default to no colour conversion for JPEG2000 and DCP content (#445).
Diffstat (limited to 'src/lib/video_content.cc')
| -rw-r--r-- | src/lib/video_content.cc | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/lib/video_content.cc b/src/lib/video_content.cc index 823517bfc..64c51be99 100644 --- a/src/lib/video_content.cc +++ b/src/lib/video_content.cc @@ -393,14 +393,16 @@ VideoContent::video_size_after_3d_split () const } void -VideoContent::unset_colour_conversion () +VideoContent::unset_colour_conversion (bool signal) { { boost::mutex::scoped_lock lm (_mutex); _colour_conversion = boost::optional<ColourConversion> (); } - signal_changed (VideoContentProperty::COLOUR_CONVERSION); + if (signal) { + signal_changed (VideoContentProperty::COLOUR_CONVERSION); + } } void |