diff options
| author | Carl Hetherington <cth@carlh.net> | 2019-11-10 22:59:39 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2020-02-15 01:53:19 +0100 |
| commit | c259c459f5d326e7c42806b41de06c71ad4a3ad8 (patch) | |
| tree | a3a976edbefb9638c11c5fa477e81efde60234c8 /src/lib/video_decoder.h | |
| parent | 9482a41238c370e093c896145b844dac0b221345 (diff) | |
Don't trust video timestamps from FFmpegDecoder.
Back-ported from 98342fb53eae4d32440fc69c279f2ca0fef785b5 in v2.15.x.
Diffstat (limited to 'src/lib/video_decoder.h')
| -rw-r--r-- | src/lib/video_decoder.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/lib/video_decoder.h b/src/lib/video_decoder.h index ed56feea0..98a8e7b7a 100644 --- a/src/lib/video_decoder.h +++ b/src/lib/video_decoder.h @@ -51,7 +51,7 @@ public: friend struct ffmpeg_pts_offset_test; friend void ffmpeg_decoder_sequential_test_one (boost::filesystem::path file, float fps, int gaps, int video_length); - ContentTime position (boost::shared_ptr<const Film>) const { + boost::optional<ContentTime> position (boost::shared_ptr<const Film>) const { return _position; } @@ -63,10 +63,10 @@ public: private: boost::shared_ptr<const Content> _content; - /** Frame of last thing to be emitted */ + /** Frame of last thing to be emitted; only used for 3D */ boost::optional<Frame> _last_emitted_frame; boost::optional<Eyes> _last_emitted_eyes; - ContentTime _position; + boost::optional<ContentTime> _position; }; #endif |