Merge master.

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

diff --git a/src/lib/image_decoder.h b/src/lib/image_decoder.h
index 8d88df3de44eda5536e97e9a02e5560e32084c80..242f69477826a499d915505cd0b9486808aba68d 100644 (file)
--- a/src/lib/image_decoder.h
+++ b/src/lib/image_decoder.h
@@ -40,7 +40,7 @@ private:
        bool pass ();
        
        boost::shared_ptr<const ImageContent> _image_content;
-       boost::shared_ptr<Image> _image;
+       boost::shared_ptr<ImageProxy> _image;
        VideoFrame _video_position;
 };