diff options
| author | Carl Hetherington <cth@carlh.net> | 2012-12-18 16:18:10 +0000 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2012-12-18 16:18:10 +0000 |
| commit | 880719c0bf2f2ce99ca44a5f5289fdd30962246a (patch) | |
| tree | cd83af4cc1e7c6e8abdcc678ef217f25def2a400 /src/lib/subtitle.cc | |
| parent | 3b03f47d632d2a1da25aab689a59ad5701e7d63c (diff) | |
Fix being tested.
Diffstat (limited to 'src/lib/subtitle.cc')
| -rw-r--r-- | src/lib/subtitle.cc | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/lib/subtitle.cc b/src/lib/subtitle.cc index 4b7f81947..1af277255 100644 --- a/src/lib/subtitle.cc +++ b/src/lib/subtitle.cc @@ -31,14 +31,15 @@ using namespace boost; /** Construct a TimedSubtitle. This is a subtitle image, position, * and a range of time over which it should be shown. * @param sub AVSubtitle to read. - * @param c Fractional seconds that should be subtracted from the AVSubtitle's PTS. */ -TimedSubtitle::TimedSubtitle (AVSubtitle const & sub, double c) +TimedSubtitle::TimedSubtitle (AVSubtitle const & sub) { assert (sub.rects > 0); - /* subtitle PTS in seconds */ - double const packet_time = ((sub.pts / AV_TIME_BASE) + float (sub.pts % AV_TIME_BASE) / 1e6) - c; + /* Subtitle PTS in seconds (within the source, not taking into account any of the + source that we may have chopped off for the DCP) + */ + double const packet_time = ((sub.pts / AV_TIME_BASE) + float (sub.pts % AV_TIME_BASE) / 1e6); /* hence start time for this sub */ _from = packet_time + (double (sub.start_display_time) / 1e3); |
