diff options
| author | Carl Hetherington <cth@carlh.net> | 2014-01-09 22:18:42 +0000 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2014-01-09 22:18:42 +0000 |
| commit | e8204f55c981493b99814f71a50b3c3d62601032 (patch) | |
| tree | 19e155586aca13839e440a0574ed5aa5cfa4c4d5 /src/lib/ffmpeg_decoder.cc | |
| parent | ae9b0b509787d244366eb8f69bdf9d563b6c6bb6 (diff) | |
| parent | e28def57ff4591f02ca3585a506ea58fbeba5d46 (diff) | |
Merge master.
Diffstat (limited to 'src/lib/ffmpeg_decoder.cc')
| -rw-r--r-- | src/lib/ffmpeg_decoder.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/lib/ffmpeg_decoder.cc b/src/lib/ffmpeg_decoder.cc index a2b3e5d3b..8742c48ec 100644 --- a/src/lib/ffmpeg_decoder.cc +++ b/src/lib/ffmpeg_decoder.cc @@ -561,7 +561,7 @@ FFmpegDecoder::decode_subtitle_packet () /* 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 = (static_cast<double> (sub.pts ) / AV_TIME_BASE) + _video_pts_offset; + double const packet_time = (static_cast<double> (sub.pts ) / AV_TIME_BASE) + _pts_offset; /* hence start time for this sub */ ContentTime const from = (packet_time + (double (sub.start_display_time) / 1e3)) * TIME_HZ; |