diff options
| author | Carl Hetherington <cth@carlh.net> | 2024-02-22 01:25:03 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2024-02-22 01:25:03 +0100 |
| commit | a45f6245e8cc785fab436c9282fa3d1baf3a8575 (patch) | |
| tree | c6ae82be2319446c35ebad6666f68dbb109f8904 /src/lib/player.cc | |
| parent | 6c3ded5baac385d95ec2cf5e625c6c796c23e318 (diff) | |
| parent | 3ffd0163026be24e5373e0674c3301ed37546e44 (diff) | |
Merge tag 'v2.16.78' into v2.17.xv2.17.12
Diffstat (limited to 'src/lib/player.cc')
| -rw-r--r-- | src/lib/player.cc | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/lib/player.cc b/src/lib/player.cc index 03935a46b..dba02cfba 100644 --- a/src/lib/player.cc +++ b/src/lib/player.cc @@ -1081,6 +1081,9 @@ Player::video (weak_ptr<Piece> weak_piece, ContentVideo video) auto const content_video = piece->content->video; + auto scaled_size = content_video->scaled_size(film->frame_size()); + DCPOMATIC_ASSERT(scaled_size); + for (auto eyes: eyes_to_emit) { use_video( std::make_shared<PlayerVideo>( @@ -1088,7 +1091,7 @@ Player::video (weak_ptr<Piece> weak_piece, ContentVideo video) content_video->actual_crop(), content_video->fade(film, video.time), scale_for_display( - content_video->scaled_size(film->frame_size()), + *scaled_size, _video_container_size, film->frame_size(), content_video->pixel_quanta() |