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/video_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/video_decoder.cc')
| -rw-r--r-- | src/lib/video_decoder.cc | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/lib/video_decoder.cc b/src/lib/video_decoder.cc index 1cde53e81..0e9ee0c1a 100644 --- a/src/lib/video_decoder.cc +++ b/src/lib/video_decoder.cc @@ -274,6 +274,7 @@ VideoDecoder::give (shared_ptr<const ImageProxy> image, Frame frame) } _log->log (String::compose ("VD receives %1", frame), LogEntry::TYPE_DEBUG_DECODE); + _position = ContentTime::from_frames (frame, _content->active_video_frame_rate()); /* Work out what we are going to push into _decoded next */ list<ContentVideo> to_push; @@ -389,4 +390,5 @@ VideoDecoder::seek (ContentTime s, bool accurate) _decoded.clear (); _last_seek_time = s; _last_seek_accurate = accurate; + _position.reset (); } |