diff options
| author | Carl Hetherington <cth@carlh.net> | 2016-12-09 21:51:36 +0000 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2016-12-09 21:51:36 +0000 |
| commit | 936ff6927ad24daf0ed20776b19b6faa3df9bf83 (patch) | |
| tree | 556123d229c916251ddc96f9a8b3164b4d815e9b /src/lib/ffmpeg_decoder.cc | |
| parent | d7013785f7a1d86feb471af826419afa6298e2b8 (diff) | |
| parent | 5757f3ba9d2cf3948bcad2b3f3ddbbf09ad754a5 (diff) | |
Merge branch 'master' of ssh://git.carlh.net/home/carl/git/dcpomatic
Diffstat (limited to 'src/lib/ffmpeg_decoder.cc')
| -rw-r--r-- | src/lib/ffmpeg_decoder.cc | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/src/lib/ffmpeg_decoder.cc b/src/lib/ffmpeg_decoder.cc index c732a5173..b6b6e594d 100644 --- a/src/lib/ffmpeg_decoder.cc +++ b/src/lib/ffmpeg_decoder.cc @@ -426,8 +426,6 @@ FFmpegDecoder::decode_audio_packet () LOG_WARNING ("Crazy timestamp %1", to_string (ct)); } - audio->set_position (ct); - /* Give this data provided there is some, and its time is sane */ if (ct >= ContentTime() && data->frames() > 0) { audio->give (*stream, data, ct); @@ -479,7 +477,6 @@ FFmpegDecoder::decode_video_packet () shared_ptr<ImageProxy> (new RawImageProxy (image)), llrint (pts * _ffmpeg_content->active_video_frame_rate ()) ); - video->set_position (ContentTime::from_seconds (pts)); } else { LOG_WARNING_NC ("Dropping frame without PTS"); } @@ -510,7 +507,6 @@ FFmpegDecoder::decode_subtitle_packet () FFmpegSubtitlePeriod sub_period = subtitle_period (sub); ContentTimePeriod period; period.from = sub_period.from + _pts_offset; - subtitle->set_position (period.from); /* We can't trust the `to' time from sub_period as there are some decoders which give a sub_period time for `to' which is subsequently overridden by a `stop' subtitle; see also FFmpegExaminer. |