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/tools | |
| parent | 6c3ded5baac385d95ec2cf5e625c6c796c23e318 (diff) | |
| parent | 3ffd0163026be24e5373e0674c3301ed37546e44 (diff) | |
Merge tag 'v2.16.78' into v2.17.xv2.17.12
Diffstat (limited to 'src/tools')
| -rw-r--r-- | src/tools/dcpomatic_cli.cc | 4 | ||||
| -rw-r--r-- | src/tools/dcpomatic_player.cc | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/src/tools/dcpomatic_cli.cc b/src/tools/dcpomatic_cli.cc index 9cb3c832a..c2e7ee76c 100644 --- a/src/tools/dcpomatic_cli.cc +++ b/src/tools/dcpomatic_cli.cc @@ -106,8 +106,8 @@ print_dump (shared_ptr<Film> film) << " start trim " << c->trim_start().seconds () << " end trim " << c->trim_end().seconds () << "\n"; - if (c->video) { - cout << "\t" << c->video->size().width << "x" << c->video->size().height << "\n" + if (c->video && c->video->size()) { + cout << "\t" << c->video->size()->width << "x" << c->video->size()->height << "\n" << "\t" << c->active_video_frame_rate(film) << "fps\n" << "\tcrop left " << c->video->requested_left_crop() << " right " << c->video->requested_right_crop() diff --git a/src/tools/dcpomatic_player.cc b/src/tools/dcpomatic_player.cc index 9c7522bc5..e65839521 100644 --- a/src/tools/dcpomatic_player.cc +++ b/src/tools/dcpomatic_player.cc @@ -477,8 +477,8 @@ public: j->set_use (true); } - if (i->video) { - auto const r = Ratio::nearest_from_ratio(i->video->size().ratio()); + if (i->video && i->video->size()) { + auto const r = Ratio::nearest_from_ratio(i->video->size()->ratio()); if (r->id() == "239") { /* Any scope content means we use scope */ _film->set_container(r); @@ -687,8 +687,8 @@ private: for (auto i: dcp->text) { i->set_use (true); } - if (dcp->video) { - auto const r = Ratio::nearest_from_ratio(dcp->video->size().ratio()); + if (dcp->video && dcp->video->size()) { + auto const r = Ratio::nearest_from_ratio(dcp->video->size()->ratio()); if (r) { _film->set_container(r); } |