diff options
| author | Carl Hetherington <cth@carlh.net> | 2013-12-24 01:12:40 +0000 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2013-12-24 01:12:40 +0000 |
| commit | dc87445987c00b85a44b6372e43894067fae44b3 (patch) | |
| tree | cddc35f1117f5bcb403b31d674791e6a453765ab /src/lib/subtitle_decoder.h | |
| parent | e194f0003b60b2607da0822485c56cd8267e78dc (diff) | |
Merge 1.0 and some subtitling fixes.
Diffstat (limited to 'src/lib/subtitle_decoder.h')
| -rw-r--r-- | src/lib/subtitle_decoder.h | 2 |
1 files changed, 1 insertions, 1 deletions
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); }; |