From: Carl Hetherington <cth@carlh.net>
Date: Thu, 27 Aug 2015 13:18:34 +0000 (+0100)
Subject: We can't use J2K data directly if we've set a new colour conversion.
X-Git-Tag: v2.1.47~12
X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=commitdiff_plain;h=0106e954d8c113f83cf3ec76d116707e0464e855

We can't use J2K data directly if we've set a new colour conversion.
---

diff --git a/src/lib/player_video.cc b/src/lib/player_video.cc
index 38374fae3..ad6219d4f 100644
--- a/src/lib/player_video.cc
+++ b/src/lib/player_video.cc
@@ -175,7 +175,7 @@ PlayerVideo::has_j2k () const
 		return false;
 	}
 
-	return _crop == Crop () && _inter_size == j2k->size() && !_subtitle && !_fade;
+	return _crop == Crop () && _inter_size == j2k->size() && !_subtitle && !_fade && !_colour_conversion;
 }
 
 Data