Merge.

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

diff --git a/src/lib/video_content.h b/src/lib/video_content.h
index 372cab3bd3c48ab5874188800cf7b41e541ebea0..697a0ecc3415b200a745800c76a89e062d98d36c 100644 (file)
--- a/src/lib/video_content.h
+++ b/src/lib/video_content.h
@@ -46,6 +46,7 @@ public:
 
        void as_xml (xmlpp::Node *) const;
        virtual std::string information () const;
+       virtual std::string identifier () const;
 
        VideoContent::Frame video_length () const {
                boost::mutex::scoped_lock lm (_mutex);
@@ -86,6 +87,11 @@ protected:
        VideoContent::Frame _video_length;
 
 private:
+       friend class ffmpeg_pts_offset_test;
+       friend class best_dcp_frame_rate_test_single;
+       friend class best_dcp_frame_rate_test_double;
+       friend class audio_sampling_rate_test;
+       
        libdcp::Size _video_size;
        float _video_frame_rate;
        Crop _crop;