diff options
| author | Carl Hetherington <cth@carlh.net> | 2014-01-15 10:14:53 +0000 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2014-01-15 10:14:53 +0000 |
| commit | f9608c5299d0a58bc01b33e521d89a80be26ed23 (patch) | |
| tree | 3c97274edcdaaecdb30c46df3e174de4a899f798 /src/lib/ffmpeg_decoder.cc | |
| parent | c943bc82e8d585d85ca1b4832e258436fa7615ce (diff) | |
| parent | f71a23109d774dc65e4262e5dba41360732cf342 (diff) | |
Merge branch 'master' into subtitle-content
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 b672b2c1f..a6f9a17c3 100644 --- a/src/lib/ffmpeg_decoder.cc +++ b/src/lib/ffmpeg_decoder.cc @@ -556,7 +556,7 @@ FFmpegDecoder::decode_subtitle_packet () 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; - + /* hence start time for this sub */ Time const from = (packet_time + (double (sub.start_display_time) / 1e3)) * TIME_HZ; Time const to = (packet_time + (double (sub.end_display_time) / 1e3)) * TIME_HZ; |