X-Git-Url: https://git.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Fffmpeg_content.h;h=8871301b16ae900d10c91b7854393bb1e8eef251;hp=4c612cd3ee00eb62720fc35fe1759f5fd2cf1451;hb=c4403784febdbdd42e9c32e67fadb147f11fe566;hpb=248fe9bd28d93a9e269093b4dfbec5d0ceb49ce1

diff --git a/src/lib/ffmpeg_content.h b/src/lib/ffmpeg_content.h
index 4c612cd3e..8871301b1 100644
--- a/src/lib/ffmpeg_content.h
+++ b/src/lib/ffmpeg_content.h
@@ -63,8 +63,8 @@ public:
 	std::string summary () const;
 	std::string technical_summary () const;
 	void as_xml (xmlpp::Node *, bool with_paths) const;
-	DCPTime full_length (boost::shared_ptr<const Film> film) const;
-	DCPTime approximate_length () const;
+	dcpomatic::DCPTime full_length (boost::shared_ptr<const Film> film) const;
+	dcpomatic::DCPTime approximate_length () const;
 
 	std::string identifier () const;
 
@@ -91,7 +91,7 @@ public:
 
 	void set_subtitle_stream (boost::shared_ptr<FFmpegSubtitleStream>);
 
-	boost::optional<ContentTime> first_video () const {
+	boost::optional<dcpomatic::ContentTime> first_video () const {
 		boost::mutex::scoped_lock lm (_mutex);
 		return _first_video;
 	}
@@ -116,7 +116,7 @@ private:
 
 	std::vector<boost::shared_ptr<FFmpegSubtitleStream> > _subtitle_streams;
 	boost::shared_ptr<FFmpegSubtitleStream> _subtitle_stream;
-	boost::optional<ContentTime> _first_video;
+	boost::optional<dcpomatic::ContentTime> _first_video;
 	/** Video filters that should be used when generating DCPs */
 	std::vector<Filter const *> _filters;