X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fimage_decoder.h;h=e2de56acb9b1789f5e0e37a584dc30b88acc8625;hb=67705b5665715abebfdd33e9f36797f040bc3e79;hp=8d88df3de44eda5536e97e9a02e5560e32084c80;hpb=b666a794a130386bc01ede2143ef40bd6973eb32;p=dcpomatic.git

diff --git a/src/lib/image_decoder.h b/src/lib/image_decoder.h
index 8d88df3de..e2de56acb 100644
--- a/src/lib/image_decoder.h
+++ b/src/lib/image_decoder.h
@@ -19,10 +19,6 @@
 
 #include "video_decoder.h"
 
-namespace Magick {
-	class Image;
-}
-
 class ImageContent;
 
 class ImageDecoder : public VideoDecoder
@@ -34,13 +30,11 @@ public:
 		return _image_content;
 	}
 
+private:
+	bool pass (PassReason, bool);
 	void seek (ContentTime, bool);
 
-private:
-	bool pass ();
-	
 	boost::shared_ptr<const ImageContent> _image_content;
-	boost::shared_ptr<Image> _image;
-	VideoFrame _video_position;
+	boost::shared_ptr<ImageProxy> _image;
+	Frame _video_position;
 };
-