Merge master.

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

diff --git a/src/lib/video_examiner.h b/src/lib/video_examiner.h
index 039c494b52fe98f630798729207b65b26b4d46f3..d4897213beb69634d1b777b955e4d0b9efa9a44b 100644 (file)
--- a/src/lib/video_examiner.h
+++ b/src/lib/video_examiner.h
@@ -17,7 +17,7 @@
 
 */
 
-#include <libdcp/types.h>
+#include <dcp/types.h>
 #include "types.h"
 #include "video_content.h"
 
@@ -26,6 +26,6 @@ class VideoExaminer
 public:
        virtual ~VideoExaminer () {}
        virtual float video_frame_rate () const = 0;
-       virtual libdcp::Size video_size () const = 0;
-       virtual VideoContent::Frame video_length () const = 0;
+       virtual dcp::Size video_size () const = 0;
+       virtual ContentTime video_length () const = 0;
 };