diff options
| author | Carl Hetherington <cth@carlh.net> | 2021-09-19 22:58:31 +0200 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2021-09-19 22:58:31 +0200 |
| commit | c162f9d8b127f56b8da46b83908000611033e6a5 (patch) | |
| tree | a00d19c969f8b9bfa061854badac14470223e1f0 | |
| parent | d0070054da8bd1ac06b41cbd41c2583cf1265e10 (diff) | |
Check _inter_size in ::has_j2k() (fixes #2086).
The example in the bug shrinks a content DCP while keeping the
container the same. We need to check that neither _out_size nor
_inter_size have changed, to check for scaling/padding.
| -rw-r--r-- | src/lib/player_video.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/lib/player_video.cc b/src/lib/player_video.cc index d3a286829..b0e75972c 100644 --- a/src/lib/player_video.cc +++ b/src/lib/player_video.cc @@ -230,7 +230,7 @@ PlayerVideo::has_j2k () const return false; } - return _crop == Crop() && _out_size == j2k->size() && !_text && !_fade && !_colour_conversion; + return _crop == Crop() && _out_size == j2k->size() && _inter_size == j2k->size() && !_text && !_fade && !_colour_conversion; } shared_ptr<const dcp::Data> |
