summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2018-05-18 02:04:45 +0100
committerCarl Hetherington <cth@carlh.net>2018-05-18 02:04:45 +0100
commitcbbc75a40156be9e3ef777e0f060f23639025e60 (patch)
treea916efb684ddbe7cd82e936db07e43efea1a84d0
parent4c9ea2f0a7c850eb44b194bb74c4eb770cf1187e (diff)
Re-add erroneously removed virtual which slows down DCP export (and possibly decoding in general).v2.13.22
-rw-r--r--ChangeLog4
-rw-r--r--src/lib/image_proxy.h2
2 files changed, 5 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 15c2bbf0f..607f6a95b 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-16 Carl Hetherington <cth@carlh.net>
* Add cancel button to DCP verification progress dialogue (#1294).
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;
};