Hand-apply 80562fe5dce5fd625da583ca6f7c2833f9db8754 from master (remove default scale and use a scale guessed from the content's size and sample aspect ratio).

1 files changed, 0 insertions, 10 deletions

diff --git a/src/lib/config.h b/src/lib/config.h
index 55a172d78..28b1dbd1d 100644
--- a/src/lib/config.h
+++ b/src/lib/config.h
@@ -135,10 +135,6 @@ public:
 		return _default_still_length;
 	}
 
-	VideoContentScale default_scale () const {
-		return _default_scale;
-	}
-
 	Ratio const * default_container () const {
 		return _default_container;
 	}
@@ -314,11 +310,6 @@ public:
 		changed ();
 	}
 
-	void set_default_scale (VideoContentScale s) {
-		_default_scale = s;
-		changed ();
-	}
-
 	void set_default_container (Ratio const * c) {
 		_default_container = c;
 		changed ();
@@ -482,7 +473,6 @@ private:
 	ISDCFMetadata _default_isdcf_metadata;
 	boost::optional<std::string> _language;
 	int _default_still_length;
-	VideoContentScale _default_scale;
 	Ratio const * _default_container;
 	DCPContentType const * _default_dcp_content_type;
 	std::string _dcp_issuer;