Merge master.

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

diff --git a/src/lib/video_decoder.h b/src/lib/video_decoder.h
index 8947c27089b2b718c819ce42b39fdfa794aee425..c3228e88dac3fb2fcb633c32b752f8e7a8676f61 100644 (file)
--- a/src/lib/video_decoder.h
+++ b/src/lib/video_decoder.h
@@ -33,7 +33,7 @@ class Image;
 class VideoDecoder : public virtual Decoder
 {
 public:
-       VideoDecoder (boost::shared_ptr<const Film>, boost::shared_ptr<const VideoContent>);
+       VideoDecoder (boost::shared_ptr<const VideoContent>);
 
        boost::shared_ptr<const VideoContent> video_content () const {
                return _video_content;
@@ -41,7 +41,7 @@ public:
 
 protected:
 
-       void video (boost::shared_ptr<const Image>, bool, VideoFrame);
+       void video (boost::shared_ptr<const Image>, bool, ContentTime);
        boost::shared_ptr<const VideoContent> _video_content;
 };