Fix some code duplication and crashes when decoding FFmpeg-embedded ASS subtitles along the way.

1 files changed, 5 insertions, 0 deletions

diff --git a/src/lib/subtitle_decoder.h b/src/lib/subtitle_decoder.h
index 73d447b9a..7a8ab32ec 100644
--- a/src/lib/subtitle_decoder.h
+++ b/src/lib/subtitle_decoder.h
@@ -27,6 +27,10 @@
 #include "content_subtitle.h"
 #include <dcp/subtitle_string.h>
 
+namespace sub {
+	class Subtitle;
+}
+
 class Image;
 
 class SubtitleDecoder
@@ -50,6 +54,7 @@ public:
 
 	void give_image (ContentTimePeriod period, boost::shared_ptr<Image>, dcpomatic::Rect<double>);
 	void give_text (ContentTimePeriod period, std::list<dcp::SubtitleString>);
+	void give_text (ContentTimePeriod period, sub::Subtitle const & subtitle);
 
 	boost::shared_ptr<const SubtitleContent> content () const {
 		return _content;