From cbbc75a40156be9e3ef777e0f060f23639025e60 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Fri, 18 May 2018 02:04:45 +0100 Subject: Re-add erroneously removed virtual which slows down DCP export (and possibly decoding in general). --- ChangeLog | 4 ++++ src/lib/image_proxy.h | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 15c2bbf0f..607f6a95b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2018-05-18 Carl Hetherington + + * Fix slow exports from DCP content (#1285). + 2018-05-16 Carl Hetherington * 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 = boost::optional()) const { return 0; } + virtual int prepare (boost::optional = boost::optional()) const { return 0; } virtual AVPixelFormat pixel_format () const = 0; virtual size_t memory_used () const = 0; }; -- cgit v1.2.3