diff options
Diffstat (limited to 'src/lib/video_content.h')
| -rw-r--r-- | src/lib/video_content.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/lib/video_content.h b/src/lib/video_content.h index f008143fa..d03aa9ce4 100644 --- a/src/lib/video_content.h +++ b/src/lib/video_content.h @@ -43,7 +43,7 @@ public: typedef int Frame; VideoContent (boost::shared_ptr<const Film>); - VideoContent (boost::shared_ptr<const Film>, DCPTime, VideoContent::Frame); + VideoContent (boost::shared_ptr<const Film>, DCPTime, VideoFrame); VideoContent (boost::shared_ptr<const Film>, boost::filesystem::path); VideoContent (boost::shared_ptr<const Film>, boost::shared_ptr<const cxml::Node>); VideoContent (boost::shared_ptr<const Film>, std::vector<boost::shared_ptr<Content> >); @@ -53,7 +53,7 @@ public: virtual std::string information () const; virtual std::string identifier () const; - VideoContent::Frame video_length () const { + VideoFrame video_length () const { boost::mutex::scoped_lock lm (_mutex); return _video_length; } @@ -123,12 +123,12 @@ public: libdcp::Size video_size_after_3d_split () const; libdcp::Size video_size_after_crop () const; - VideoContent::Frame time_to_content_video_frames (DCPTime) const; + VideoFrame time_to_content_video_frames (DCPTime) const; protected: void take_from_video_examiner (boost::shared_ptr<VideoExaminer>); - VideoContent::Frame _video_length; + VideoFrame _video_length; private: friend class ffmpeg_pts_offset_test; |