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.cc | |
| parent | e194f0003b60b2607da0822485c56cd8267e78dc (diff) | |
Merge 1.0 and some subtitling fixes.
Diffstat (limited to 'src/lib/subtitle_decoder.cc')
| -rw-r--r-- | src/lib/subtitle_decoder.cc | 2 |
1 files changed, 1 insertions, 1 deletions
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))); } |