From c162f9d8b127f56b8da46b83908000611033e6a5 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Sun, 19 Sep 2021 22:58:31 +0200 Subject: [PATCH] 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. --- src/lib/player_video.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 -- 2.30.2