Merge branch 'master' into 1.0

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

diff --git a/src/lib/imagemagick_decoder.h b/src/lib/imagemagick_decoder.h
index cb524b44ba2bad08b9fabcde78f7a815d72ccfa3..e7c9dee9a3ac35373668433e6208d02128aafc0a 100644 (file)
--- a/src/lib/imagemagick_decoder.h
+++ b/src/lib/imagemagick_decoder.h
@@ -37,20 +37,7 @@ public:
        libdcp::Size native_size () const;
        ContentVideoFrame video_length () const;
 
-       int audio_channels () const {
-               return 0;
-       }
-
-       int audio_sample_rate () const {
-               return 0;
-       }
-
-       int64_t audio_channel_layout () const {
-               return 0;
-       }
-
        bool seek (double);
-       bool seek_to_last ();
        bool pass ();
 
 protected:
@@ -76,5 +63,6 @@ protected:
 
 private:
        boost::shared_ptr<const ImageMagickContent> _imagemagick_content;
+       boost::shared_ptr<Image> _image;
        ContentVideoFrame _position;
 };