Merge branch 'master' into 1.0-seek

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

diff --git a/src/lib/image_examiner.h b/src/lib/image_examiner.h
index 8887f0d3d15a2587f56faff713a62835b3af8a7b..f5d5150749971c6f874880802e1da1ff09b96555 100644 (file)
--- a/src/lib/image_examiner.h
+++ b/src/lib/image_examiner.h
@@ -32,7 +32,7 @@ public:
 
        float video_frame_rate () const;
        libdcp::Size video_size () const;
-       VideoContent::Frame video_length () const {
+       VideoFrame 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<libdcp::Size> _video_size;
-       VideoContent::Frame _video_length;
+       VideoFrame _video_length;
 };