X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fimage_decoder.h;h=4d96306a89c63775121f4e243da36ce2aa507372;hb=1dab4d3d084eda74612a3ebf0688ebc6fda7e78b;hp=63b4c58e344f42ece958d7a58e75441d00da216c;hpb=1629bd7df2150156109afbc7a16677cb29e82adf;p=dcpomatic.git

diff --git a/src/lib/image_decoder.h b/src/lib/image_decoder.h
index 63b4c58e3..4d96306a8 100644
--- a/src/lib/image_decoder.h
+++ b/src/lib/image_decoder.h
@@ -19,28 +19,23 @@
 
 #include "video_decoder.h"
 
-namespace Magick {
-	class Image;
-}
-
 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;
 	}
 
-	void seek (ContentTime, bool);
-
 private:
 	bool pass ();
-	
+	void seek (ContentTime, bool);
+
 	boost::shared_ptr<const ImageContent> _image_content;
-	boost::shared_ptr<Image> _image;
-	VideoFrame _video_position;
+	boost::shared_ptr<ImageProxy> _image;
+	Frame _video_position;
 };