Merge branch 'new-env-test'

3 files changed, 3 insertions, 1 deletions

diff --git a/src/lib/encoder.h b/src/lib/encoder.h
index 2d9780b52..20ec8fb16 100644
--- a/src/lib/encoder.h
+++ b/src/lib/encoder.h
@@ -53,6 +53,7 @@ class Encoder
 {
 public:
 	Encoder (boost::shared_ptr<const Film> f, boost::shared_ptr<const Options> o);
+	virtual ~Encoder () {}
 
 	/** Called to indicate that a processing run is about to begin */
 	virtual void process_begin (int64_t audio_channel_layout) = 0;
diff --git a/src/lib/film.h b/src/lib/film.h
index 049af45e2..32456dfda 100644
--- a/src/lib/film.h
+++ b/src/lib/film.h
@@ -340,7 +340,7 @@ public:
 	void set_directory (std::string);
 	void set_name (std::string);
 	void set_use_dci_name (bool);
-	virtual void set_content (std::string);
+	void set_content (std::string);
 	void set_dcp_content_type (DCPContentType const *);
 	void set_format (Format const *);
 	void set_crop (Crop);
diff --git a/src/lib/job.h b/src/lib/job.h
index b09964cf9..41cefb9be 100644
--- a/src/lib/job.h
+++ b/src/lib/job.h
@@ -39,6 +39,7 @@ class Job : public boost::enable_shared_from_this<Job>
 {
 public:
 	Job (boost::shared_ptr<Film> s, boost::shared_ptr<Job> req);
+	virtual ~Job() {}
 
 	/** @return user-readable name of this job */
 	virtual std::string name () const = 0;