Merge master.

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

diff --git a/src/lib/video_decoder.h b/src/lib/video_decoder.h
index 145baa40b0ca115acda97f8b33376d8712890193..f5c3cd743ba43bf3df96d4a1706507a33a0e3a95 100644 (file)
--- a/src/lib/video_decoder.h
+++ b/src/lib/video_decoder.h
@@ -32,7 +32,7 @@
 #include "content_video.h"
 
 class VideoContent;
-class Image;
+class ImageProxy;
 
 /** @class VideoDecoder
  *  @brief Parent for classes which decode video.
@@ -55,11 +55,12 @@ public:
 protected:
 
        void seek (ContentTime time, bool accurate);
-       void video (boost::shared_ptr<const Image>, VideoFrame frame);
+       void video (boost::shared_ptr<const ImageProxy>, VideoFrame frame);
        std::list<ContentVideo> decoded_video (VideoFrame frame);
 
        boost::shared_ptr<const VideoContent> _video_content;
        std::list<ContentVideo> _decoded_video;
+       bool _same;
 };
 
 #endif