Fix mis-merge.

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

diff --git a/src/lib/player_video.h b/src/lib/player_video.h
index a874fd3b262a0afb28459e7c44cbab31c6c123d0..c38d60641f71f499210ccf41ed577f1abec65e09 100644 (file)
--- a/src/lib/player_video.h
+++ b/src/lib/player_video.h
@@ -31,6 +31,7 @@ extern "C" {
 }
 #include <boost/shared_ptr.hpp>
 #include <boost/weak_ptr.hpp>
+#include <boost/thread/mutex.hpp>
 
 class Image;
 class ImageProxy;
@@ -126,6 +127,14 @@ private:
 
        mutable boost::mutex _mutex;
        mutable boost::shared_ptr<Image> _image;
+       /** _crop that was used to make _image */
+       mutable Crop _image_crop;
+       /** _inter_size that was used to make _image */
+       mutable dcp::Size _image_inter_size;
+       /** _out_size that was used to make _image */
+       mutable dcp::Size _image_out_size;
+       /** _fade that was used to make _image */
+       mutable boost::optional<double> _image_fade;
 };
 
 #endif