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..8d901cbcdfa2d8b0a06745da2e0eabb4ccbf0943 100644 (file)
--- a/src/lib/video_content.h
+++ b/src/lib/video_content.h
@@ -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;
@@ -139,7 +140,6 @@ private:
        void setup_default_colour_conversion ();
        
        libdcp::Size _video_size;
-       float _video_frame_rate;
        VideoFrameType _video_frame_type;
        Crop _crop;
        Ratio const * _ratio;