projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote-tracking branch 'origin/master' into 1.0
[dcpomatic.git]
/
src
/
lib
/
video_content.cc
diff --git
a/src/lib/video_content.cc
b/src/lib/video_content.cc
index a2a4e6c6b3b46c452290975d5eccb2952fbaab89..a8590ce55b4a70f23c3d6ec7519e59f3f9ee5219 100644
(file)
--- 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)
, _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 ();
}
{
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)
, _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 ();
}
{
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)
, _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 ();
}
{
setup_default_colour_conversion ();
}