diff options
| author | Carl Hetherington <cth@carlh.net> | 2014-01-15 16:36:28 +0000 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2014-01-15 16:36:28 +0000 |
| commit | 4e5d5c7dcc6470b8dc918d03a00e30c07df60efe (patch) | |
| tree | c167419e927f260348b468aae5036815a6a640a5 /src/lib/ffmpeg_decoder.cc | |
| parent | e8204f55c981493b99814f71a50b3c3d62601032 (diff) | |
| parent | f71a23109d774dc65e4262e5dba41360732cf342 (diff) | |
Merge master.
Diffstat (limited to 'src/lib/ffmpeg_decoder.cc')
| -rw-r--r-- | src/lib/ffmpeg_decoder.cc | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/lib/ffmpeg_decoder.cc b/src/lib/ffmpeg_decoder.cc index 8742c48ec..52afe2a27 100644 --- a/src/lib/ffmpeg_decoder.cc +++ b/src/lib/ffmpeg_decoder.cc @@ -160,8 +160,6 @@ FFmpegDecoder::pass () return true; } - avcodec_get_frame_defaults (_frame); - shared_ptr<const Film> film = _film.lock (); assert (film); @@ -561,8 +559,13 @@ 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) */ +<<<<<<< HEAD double const packet_time = (static_cast<double> (sub.pts ) / AV_TIME_BASE) + _pts_offset; +======= + double const packet_time = (static_cast<double> (sub.pts ) / AV_TIME_BASE) + _video_pts_offset; + +>>>>>>> master /* hence start time for this sub */ ContentTime const from = (packet_time + (double (sub.start_display_time) / 1e3)) * TIME_HZ; ContentTime const to = (packet_time + (double (sub.end_display_time) / 1e3)) * TIME_HZ; |