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.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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

diff --git a/src/lib/subtitle_decoder.cc b/src/lib/subtitle_decoder.cc
index 389e4b13a..7ba969933 100644
--- a/src/lib/subtitle_decoder.cc
+++ b/src/lib/subtitle_decoder.cc
@@ -34,7 +34,7 @@ SubtitleDecoder::SubtitleDecoder (shared_ptr<const Film> f)
  *  Image may be 0 to say that there is no current subtitle.
  */
 void
-SubtitleDecoder::subtitle (shared_ptr<Image> image, dcpomatic::Rect<double> rect, DCPTime from, DCPTime to)
+SubtitleDecoder::subtitle (shared_ptr<Image> image, dcpomatic::Rect<double> rect, ContentTime from, ContentTime to)
 {
 	_pending.push_back (shared_ptr<DecodedSubtitle> (new DecodedSubtitle (image, rect, from, to)));
 }
-- 
cgit v1.2.3