summaryrefslogtreecommitdiff
path: root/src/lib/player.cc
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2015-05-12 16:13:48 +0100
committerCarl Hetherington <cth@carlh.net>2015-05-12 16:13:48 +0100
commit2bfd531137f1a4874493186015046e33c5a07c1e (patch)
tree76f753a5307e8e37c9802aed765f2c93ca911ac2 /src/lib/player.cc
parent120c587cffb540d18b519f53615dd73e33df177c (diff)
Assorted image subtitle fixes.
Diffstat (limited to 'src/lib/player.cc')
-rw-r--r--src/lib/player.cc8
1 files changed, 5 insertions, 3 deletions
diff --git a/src/lib/player.cc b/src/lib/player.cc
index 436ae3fe8..640253c6d 100644
--- a/src/lib/player.cc
+++ b/src/lib/player.cc
@@ -376,9 +376,11 @@ Player::get_video (DCPTime time, bool accurate)
list<PositionImage> c = transform_image_subtitles (ps.image);
copy (c.begin(), c.end(), back_inserter (sub_images));
- /* Text subtitles (rendered to images) */
- sub_images.push_back (render_subtitles (ps.text, _video_container_size));
-
+ /* Text subtitles (rendered to an image) */
+ if (!ps.text.empty ()) {
+ sub_images.push_back (render_subtitles (ps.text, _video_container_size));
+ }
+
if (!sub_images.empty ()) {
for (list<shared_ptr<PlayerVideo> >::const_iterator i = pvf.begin(); i != pvf.end(); ++i) {
(*i)->set_subtitle (merge (sub_images));