summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2015-08-27 14:18:34 +0100
committerCarl Hetherington <cth@carlh.net>2015-08-27 14:18:34 +0100
commit0106e954d8c113f83cf3ec76d116707e0464e855 (patch)
tree1123af55e07bf1b0c345d8419add00508e51a834 /src
parentaa36b8c781059aa573a1465692bc9ae5973253f1 (diff)
We can't use J2K data directly if we've set a new colour conversion.
Diffstat (limited to 'src')
-rw-r--r--src/lib/player_video.cc2
1 files changed, 1 insertions, 1 deletions
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