projects
/
dcpomatic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
aa36b8c
)
We can't use J2K data directly if we've set a new colour conversion.
author
Carl Hetherington
<cth@carlh.net>
Thu, 27 Aug 2015 13:18:34 +0000
(14:18 +0100)
committer
Carl Hetherington
<cth@carlh.net>
Thu, 27 Aug 2015 13:18:34 +0000
(14:18 +0100)
src/lib/player_video.cc
patch
|
blob
|
history
diff --git
a/src/lib/player_video.cc
b/src/lib/player_video.cc
index 38374fae3552e03c99cca1bd51253cabe82ff2ee..ad6219d4f12f4f496ae0c7ee2589445fad68ca31 100644
(file)
--- 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