summaryrefslogtreecommitdiff
path: root/src/lib/video_decoder.h
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2019-05-08 23:41:42 +0100
committerCarl Hetherington <cth@carlh.net>2019-05-10 23:43:55 +0100
commitc4403784febdbdd42e9c32e67fadb147f11fe566 (patch)
treea3c76832e341eedcaed2152c2ebf4dd76325b6b2 /src/lib/video_decoder.h
parent248fe9bd28d93a9e269093b4dfbec5d0ceb49ce1 (diff)
Put Time types in dcpomatic namespace.
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 0fc7ca5a4..c2ba8386e 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 {
+ dcpomatic::ContentTime position (boost::shared_ptr<const Film>) const {
return _position;
}
@@ -65,7 +65,7 @@ private:
/** Time of last thing to be emitted */
boost::shared_ptr<const Content> _content;
boost::optional<Frame> _last_emitted;
- ContentTime _position;
+ dcpomatic::ContentTime _position;
};
#endif