From 65cc06076b46cbd27ccfcf7387894358e2c8ab1e Mon Sep 17 00:00:00 2001
From: Carl Hetherington <cth@carlh.net>
Date: Wed, 18 Jul 2018 23:13:48 +0100
Subject: Merge master.

---
 src/lib/dcp_text_decoder.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/lib/dcp_text_decoder.cc')

diff --git a/src/lib/dcp_text_decoder.cc b/src/lib/dcp_text_decoder.cc
index 741bbb8bc..576cfd357 100644
--- a/src/lib/dcp_text_decoder.cc
+++ b/src/lib/dcp_text_decoder.cc
@@ -86,7 +86,7 @@ DCPTextDecoder::pass ()
 }
 
 ContentTimePeriod
-DCPTextDecoder::content_time_period (shared_ptr<dcp::SubtitleString> s) const
+DCPTextDecoder::content_time_period (shared_ptr<dcp::Subtitle> s) const
 {
 	return ContentTimePeriod (
 		ContentTime::from_seconds (s->in().as_seconds ()),
-- 
cgit v1.2.3