Revert "Avoid decoding other packets when looking for subs."

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

diff --git a/src/lib/image_decoder.h b/src/lib/image_decoder.h
index 8d88df3de44eda5536e97e9a02e5560e32084c80..4d96306a89c63775121f4e243da36ce2aa507372 100644 (file)
--- 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,12 @@ public:
                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;
 };