Merge 1.0

[dcpomatic.git] / src / lib / subtitle_decoder.h

diff --git a/src/lib/subtitle_decoder.h b/src/lib/subtitle_decoder.h
index 4836e31fa980af02589b330eadddbddb8b45b16d..fd1d71f33fdef23b3ef8ed7b5d69140baa4ed2cb 100644 (file)
--- 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);
 };