Merge master.

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

diff --git a/src/lib/image_decoder.h b/src/lib/image_decoder.h
index f4d81dfb507a5ef545c0f573542904472d023956..242f69477826a499d915505cd0b9486808aba68d 100644 (file)
--- a/src/lib/image_decoder.h
+++ b/src/lib/image_decoder.h
@@ -28,7 +28,7 @@ class ImageContent;
 class ImageDecoder : public VideoDecoder
 {
 public:
-       ImageDecoder (boost::shared_ptr<const Film>, boost::shared_ptr<const ImageContent>);
+       ImageDecoder (boost::shared_ptr<const ImageContent> c);
 
        boost::shared_ptr<const ImageContent> content () {
                return _image_content;
@@ -40,7 +40,7 @@ private:
        bool pass ();
        
        boost::shared_ptr<const ImageContent> _image_content;
-       boost::shared_ptr<Image> _image;
-       ContentTime _video_position;
+       boost::shared_ptr<ImageProxy> _image;
+       VideoFrame _video_position;
 };