X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fimage_decoder.h;h=e2de56acb9b1789f5e0e37a584dc30b88acc8625;hb=6fde557864505b470c438e4161ee494f29b90d63;hp=242f69477826a499d915505cd0b9486808aba68d;hpb=4e411ea97b4dab8a5fa282d1d4cf7971ef1e24ad;p=dcpomatic.git diff --git a/src/lib/image_decoder.h b/src/lib/image_decoder.h index 242f69477..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 _image_content; boost::shared_ptr _image; - VideoFrame _video_position; + Frame _video_position; }; -