Support subs and tidy up a few things.

2 files changed, 5 insertions, 1 deletions

diff --git a/src/lib/image.cc b/src/lib/image.cc
index 8e6c5717b..d2f8fbbfd 100644
--- a/src/lib/image.cc
+++ b/src/lib/image.cc
@@ -1154,7 +1154,7 @@ merge (list<PositionImage> images)
 		all.extend (dcpomatic::Rect<int>(i.position, i.image->size().width, i.image->size().height));
 	}
 
-	auto merged = make_shared<Image>(images.front().image->pixel_format(), dcp::Size(all.width, all.height), true);
+	auto merged = make_shared<Image>(images.front().image->pixel_format(), dcp::Size(all.width, all.height), false);
 	merged->make_transparent ();
 	for (auto const& i: images) {
 		merged->alpha_blend (i.image, i.position - all.position());
diff --git a/src/lib/player_video.h b/src/lib/player_video.h
index 553d3c5bc..347d10667 100644
--- a/src/lib/player_video.h
+++ b/src/lib/player_video.h
@@ -109,6 +109,10 @@ public:
 		return _inter_size;
 	}
 
+	dcp::Size out_size () const {
+		return _out_size;
+	}
+
 	bool same (std::shared_ptr<const PlayerVideo> other) const;
 
 	size_t memory_used () const;