projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge master.
[dcpomatic.git]
/
src
/
lib
/
player_video_frame.cc
diff --git
a/src/lib/player_video_frame.cc
b/src/lib/player_video_frame.cc
index 2544f8bbcb0f3c7f330d7c6cc1073bd01a427ba8..5463925bf89e015bf31b58ebbccccad54ac19b5b 100644
(file)
--- a/
src/lib/player_video_frame.cc
+++ b/
src/lib/player_video_frame.cc
@@
-50,7
+50,7
@@
PlayerVideoFrame::PlayerVideoFrame (
}
}
-PlayerVideoFrame::PlayerVideoFrame (shared_ptr<cxml::Node> node, shared_ptr<Socket> socket)
+PlayerVideoFrame::PlayerVideoFrame (shared_ptr<cxml::Node> node, shared_ptr<Socket> socket
, shared_ptr<Log> log
)
{
_crop = Crop (node);
{
_crop = Crop (node);
@@
-61,7
+61,7
@@
PlayerVideoFrame::PlayerVideoFrame (shared_ptr<cxml::Node> node, shared_ptr<Sock
_part = (Part) node->number_child<int> ("Part");
_colour_conversion = ColourConversion (node);
_part = (Part) node->number_child<int> ("Part");
_colour_conversion = ColourConversion (node);
- _in = image_proxy_factory (node->node_child ("In"), socket);
+ _in = image_proxy_factory (node->node_child ("In"), socket
, log
);
if (node->optional_number_child<int> ("SubtitleX")) {
if (node->optional_number_child<int> ("SubtitleX")) {