From c2d6d07ed57707ae2342c9a0b352b7c507cd5005 Mon Sep 17 00:00:00 2001
From: Carl Hetherington <cth@carlh.net>
Date: Thu, 2 Jul 2015 12:08:36 +0100
Subject: [PATCH] Fix PlayerVideo::has_j2k to cope with subtitles and fades.

---
 ChangeLog               | 2 ++
 src/lib/player_video.cc | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 112315234..bd586f198 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 2015-07-02  c.hetherington  <cth@carlh.net>
 
+	* Fix failure to burn subs over existing DCP sources.
+
 	* Remove output gamma configuration option.
 
 2015-07-02  Carl Hetherington  <cth@carlh.net>
diff --git a/src/lib/player_video.cc b/src/lib/player_video.cc
index 765896a0e..2b1e85fc9 100644
--- a/src/lib/player_video.cc
+++ b/src/lib/player_video.cc
@@ -167,14 +167,14 @@ PlayerVideo::send_binary (shared_ptr<Socket> socket) const
 bool
 PlayerVideo::has_j2k () const
 {
-	/* XXX: burnt-in subtitle; maybe other things */
+	/* XXX: maybe other things */
 
 	shared_ptr<const J2KImageProxy> j2k = dynamic_pointer_cast<const J2KImageProxy> (_in);
 	if (!j2k) {
 		return false;
 	}
 
-	return _crop == Crop () && _inter_size == j2k->size();
+	return _crop == Crop () && _inter_size == j2k->size() && !_subtitle && !_fade;
 }
 
 Data
-- 
2.30.2