From dc87445987c00b85a44b6372e43894067fae44b3 Mon Sep 17 00:00:00 2001
From: Carl Hetherington <cth@carlh.net>
Date: Tue, 24 Dec 2013 01:12:40 +0000
Subject: Merge 1.0 and some subtitling fixes.

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

(limited to 'src/lib/subtitle_decoder.h')

diff --git a/src/lib/subtitle_decoder.h b/src/lib/subtitle_decoder.h
index 4836e31fa..fd1d71f33 100644
--- a/src/lib/subtitle_decoder.h
+++ b/src/lib/subtitle_decoder.h
@@ -33,5 +33,5 @@ public:
 	SubtitleDecoder (boost::shared_ptr<const Film>);
 
 protected:
-	void subtitle (boost::shared_ptr<Image>, dcpomatic::Rect<double>, DCPTime, DCPTime);
+	void subtitle (boost::shared_ptr<Image>, dcpomatic::Rect<double>, ContentTime, ContentTime);
 };
-- 
cgit v1.2.3