Cherry pick cbbc75a40156be9e3ef777e0f060f23639025e60 from master to fix slow exports.

2 files changed, 5 insertions, 1 deletions

diff --git a/ChangeLog b/ChangeLog
index abb237012..66d010b6d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2018-05-18  Carl Hetherington  <cth@carlh.net>
+
+	* Fix slow exports from DCP content (#1285).
+
 2018-05-15  Carl Hetherington  <cth@carlh.net>
 
 	* Version 2.12.5 released.
diff --git a/src/lib/image_proxy.h b/src/lib/image_proxy.h
index 846aec136..b377d5362 100644
--- a/src/lib/image_proxy.h
+++ b/src/lib/image_proxy.h
@@ -80,7 +80,7 @@ public:
 	 *  This method may be called in a different thread to image().
 	 *  @return log2 of any scaling down that will be applied to the image.
 	 */
-	int prepare (boost::optional<dcp::Size> = boost::optional<dcp::Size>()) const { return 0; }
+	virtual int prepare (boost::optional<dcp::Size> = boost::optional<dcp::Size>()) const { return 0; }
 	virtual AVPixelFormat pixel_format () const = 0;
 	virtual size_t memory_used () const = 0;
 };