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_video.cc | |
| parent | 6c3ded5baac385d95ec2cf5e625c6c796c23e318 (diff) | |
| parent | 3ffd0163026be24e5373e0674c3301ed37546e44 (diff) | |
Merge tag 'v2.16.78' into v2.17.xv2.17.12
Diffstat (limited to 'src/lib/player_video.cc')
| -rw-r--r-- | src/lib/player_video.cc | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/lib/player_video.cc b/src/lib/player_video.cc index b020ca1cd..b39f83908 100644 --- a/src/lib/player_video.cc +++ b/src/lib/player_video.cc @@ -363,8 +363,13 @@ PlayerVideo::reset_metadata (shared_ptr<const Film> film, dcp::Size player_video _crop = content->video->actual_crop(); _fade = content->video->fade(film, _video_time.get()); + auto const size = content->video->scaled_size(film->frame_size()); + if (!size) { + return false; + } + _inter_size = scale_for_display( - content->video->scaled_size(film->frame_size()), + *size, player_video_container_size, film->frame_size(), content->video->pixel_quanta() |