projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
C++11 tidying.
[dcpomatic.git]
/
src
/
lib
/
video_content.cc
diff --git
a/src/lib/video_content.cc
b/src/lib/video_content.cc
index 0ef1021161d7a69004494d733da1b83bc02ca046..c6574fce3e24db0dcf815b7005191492c01af5f3 100644
(file)
--- a/
src/lib/video_content.cc
+++ b/
src/lib/video_content.cc
@@
-196,7
+196,7
@@
VideoContent::VideoContent (Content* parent, cxml::ConstNodePtr node, int versio
}
}
-VideoContent::VideoContent (Content* parent, vector<shared_ptr<Content>
> c)
+VideoContent::VideoContent (Content* parent, vector<shared_ptr<Content>> c)
: ContentPart (parent)
, _length (0)
, _yuv (false)
: ContentPart (parent)
, _length (0)
, _yuv (false)
@@
-655,7
+655,7
@@
VideoContent::scaled_size (dcp::Size film_container)
_legacy_ratio = boost::optional<float>();
}
_legacy_ratio = boost::optional<float>();
}
- return
auto_size
;
+ return
_pixel_quanta.round (auto_size)
;
}
}