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 ec90051daf8e43c45a565d69d9ad43f212636c52..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
@@ -35,11 +31,11 @@ public:
        }
 
 private:
-       bool pass (PassReason);
+       bool pass ();
        void seek (ContentTime, bool);
-       
+
        boost::shared_ptr<const ImageContent> _image_content;
        boost::shared_ptr<ImageProxy> _image;
-       VideoFrame _video_position;
+       Frame _video_position;
 };