Merge branch 'main' into v2.17.x

1 files changed, 5 insertions, 2 deletions

diff --git a/src/lib/player.cc b/src/lib/player.cc
index 9debbaf7b..888c56aec 100644
--- a/src/lib/player.cc
+++ b/src/lib/player.cc
@@ -912,7 +912,7 @@ Player::open_subtitles_for_frame (DCPTime time) const
 
 		/* Bitmap subtitles */
 		for (auto i: j.bitmap) {
-			if (!i.image) {
+			if (!i.image || i.image->size().width == 0 || i.image->size().height == 0) {
 				continue;
 			}
 
@@ -933,7 +933,10 @@ Player::open_subtitles_for_frame (DCPTime time) const
 		/* String subtitles (rendered to an image) */
 		if (!j.string.empty()) {
 			auto s = render_text(j.string, _video_container_size, time, vfr);
-			copy (s.begin(), s.end(), back_inserter (captions));
+			copy_if(s.begin(), s.end(), back_inserter(captions), [](PositionImage const& image) {
+				return image.image->size().width && image.image->size().height;
+			});
+
 		}
 	}