Merge master.

[dcpomatic.git] / src / lib / image_examiner.h

diff --git a/src/lib/image_examiner.h b/src/lib/image_examiner.h
index 1800f1ea36e18921500924740f86de0948c98b8d..6ae0422cbbd4477f8ac7878e05a2430b251711b0 100644 (file)
--- a/src/lib/image_examiner.h
+++ b/src/lib/image_examiner.h
@@ -32,7 +32,7 @@ public:
 
        float video_frame_rate () const;
        dcp::Size video_size () const;
-       VideoFrame video_length () const {
+       ContentTime video_length () const {
                return _video_length;
        }
 
@@ -40,5 +40,5 @@ private:
        boost::weak_ptr<const Film> _film;
        boost::shared_ptr<const ImageContent> _image_content;
        boost::optional<dcp::Size> _video_size;
-       VideoFrame _video_length;
+       ContentTime _video_length;
 };