diff options
| author | Carl Hetherington <cth@carlh.net> | 2018-07-18 23:13:48 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2018-07-19 23:36:56 +0100 |
| commit | 65cc06076b46cbd27ccfcf7387894358e2c8ab1e (patch) | |
| tree | 72eed4030fa0cf08190723410467645a1f199dd1 /src/lib | |
| parent | 491edba4e79656a045103a284c65b846a167d2ff (diff) | |
Merge master.
Diffstat (limited to 'src/lib')
| -rw-r--r-- | src/lib/dcp_text_decoder.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/lib/dcp_text_decoder.cc b/src/lib/dcp_text_decoder.cc index 741bbb8bc..576cfd357 100644 --- a/src/lib/dcp_text_decoder.cc +++ b/src/lib/dcp_text_decoder.cc @@ -86,7 +86,7 @@ DCPTextDecoder::pass () } ContentTimePeriod -DCPTextDecoder::content_time_period (shared_ptr<dcp::SubtitleString> s) const +DCPTextDecoder::content_time_period (shared_ptr<dcp::Subtitle> s) const { return ContentTimePeriod ( ContentTime::from_seconds (s->in().as_seconds ()), |