summaryrefslogtreecommitdiff
path: root/src/lib/video_decoder.h
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2017-02-21 21:42:44 +0000
committerCarl Hetherington <cth@carlh.net>2017-04-19 23:04:32 +0100
commit89aa9d4ba69e471949f791cdafe4ae20cea554d2 (patch)
treea8260555268d392292775a2851d8780e5612091b /src/lib/video_decoder.h
parent7db99ef207c68910ee96a3e806c9832e8f90b219 (diff)
Various fixes to push audio vaguely in the right direction.
Diffstat (limited to 'src/lib/video_decoder.h')
-rw-r--r--src/lib/video_decoder.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/lib/video_decoder.h b/src/lib/video_decoder.h
index 6609811e4..e16884568 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);
- boost::optional<ContentTime> position () const {
+ ContentTime position () const {
return _position;
}
@@ -62,7 +62,7 @@ public:
private:
boost::shared_ptr<const Content> _content;
boost::optional<Frame> _last_emitted;
- boost::optional<ContentTime> _position;
+ ContentTime _position;
};
#endif