summaryrefslogtreecommitdiff
path: root/src/tools
diff options
context:
space:
mode:
Diffstat (limited to 'src/tools')
-rw-r--r--src/tools/dcpomatic_cli.cc4
-rw-r--r--src/tools/dcpomatic_player.cc8
2 files changed, 6 insertions, 6 deletions
diff --git a/src/tools/dcpomatic_cli.cc b/src/tools/dcpomatic_cli.cc
index c07f39add..65252ff29 100644
--- a/src/tools/dcpomatic_cli.cc
+++ b/src/tools/dcpomatic_cli.cc
@@ -103,8 +103,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);
}