Merge master.

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

diff --git a/src/lib/video_content.h b/src/lib/video_content.h
index d03aa9ce4ae326248e24f4abb57fa6acebcec5c1..96572bbd9adff2dbfc22c233e67bf49c48ba4b47 100644 (file)
--- a/src/lib/video_content.h
+++ b/src/lib/video_content.h
@@ -58,7 +58,7 @@ public:
                return _video_length;
        }
 
-       libdcp::Size video_size () const {
+       dcp::Size video_size () const {
                boost::mutex::scoped_lock lm (_mutex);
                return _video_size;
        }
@@ -120,8 +120,8 @@ public:
                return _colour_conversion;
        }
 
-       libdcp::Size video_size_after_3d_split () const;
-       libdcp::Size video_size_after_crop () const;
+       dcp::Size video_size_after_3d_split () const;
+       dcp::Size video_size_after_crop () const;
 
        VideoFrame time_to_content_video_frames (DCPTime) const;
 
@@ -129,6 +129,7 @@ protected:
        void take_from_video_examiner (boost::shared_ptr<VideoExaminer>);
 
        VideoFrame _video_length;
+       float _video_frame_rate;
 
 private:
        friend class ffmpeg_pts_offset_test;
@@ -138,8 +139,7 @@ private:
 
        void setup_default_colour_conversion ();
        
-       libdcp::Size _video_size;
-       float _video_frame_rate;
+       dcp::Size _video_size;
        VideoFrameType _video_frame_type;
        Crop _crop;
        Ratio const * _ratio;