diff options
| author | Carl Hetherington <cth@carlh.net> | 2014-07-16 17:02:25 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2014-07-16 17:02:25 +0100 |
| commit | 1f82930e73679d6aec5223caa255f564339a1a2a (patch) | |
| tree | f65a262629f6f0fbe357efe6aded5f799bb7b757 /src/lib/video_content.cc | |
| parent | fc56dc97103d00437843a31e1ef0c4915900ad1a (diff) | |
| parent | 5c6191a5a154e60ae8a1be8b09372be183c1a520 (diff) | |
Merge remote-tracking branch 'origin/master' into 1.0
Diffstat (limited to 'src/lib/video_content.cc')
| -rw-r--r-- | src/lib/video_content.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/lib/video_content.cc b/src/lib/video_content.cc index a2a4e6c6b..a8590ce55 100644 --- a/src/lib/video_content.cc +++ b/src/lib/video_content.cc @@ -63,7 +63,7 @@ VideoContent::VideoContent (shared_ptr<const Film> f) , _video_length (0) , _video_frame_rate (0) , _video_frame_type (VIDEO_FRAME_TYPE_2D) - , _scale (Ratio::from_id ("185")) + , _scale (Config::instance()->default_scale ()) { setup_default_colour_conversion (); } @@ -73,7 +73,7 @@ VideoContent::VideoContent (shared_ptr<const Film> f, DCPTime s, ContentTime len , _video_length (len) , _video_frame_rate (0) , _video_frame_type (VIDEO_FRAME_TYPE_2D) - , _scale (Ratio::from_id ("185")) + , _scale (Config::instance()->default_scale ()) { setup_default_colour_conversion (); } @@ -83,7 +83,7 @@ VideoContent::VideoContent (shared_ptr<const Film> f, boost::filesystem::path p) , _video_length (0) , _video_frame_rate (0) , _video_frame_type (VIDEO_FRAME_TYPE_2D) - , _scale (Ratio::from_id ("185")) + , _scale (Config::instance()->default_scale ()) { setup_default_colour_conversion (); } |