Merge master.

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

diff --git a/src/lib/imagemagick_decoder.h b/src/lib/imagemagick_decoder.h
index 2f4e2c9677a64e9a162f49a27645be9561f0840b..80a08f81f8374a3126a425ee413d0c0eedf21e29 100644 (file)
--- a/src/lib/imagemagick_decoder.h
+++ b/src/lib/imagemagick_decoder.h
@@ -28,10 +28,7 @@ class ImageMagickDecoder : public VideoDecoder
 public:
        ImageMagickDecoder (boost::shared_ptr<Film>, DecodeOptions);
 
-       float frames_per_second () const {
-               /* We don't know */
-               return 0;
-       }
+       float frames_per_second () const;
 
        libdcp::Size native_size () const;
 
@@ -82,4 +79,6 @@ private:
        
        std::list<std::string> _files;
        std::list<std::string>::iterator _iter;
+
+       boost::shared_ptr<Image> _image;
 };