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 4258c63614cf25fd6585090b329b4af06cb73c2f..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);
 
@@ -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);
 
-       _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")) {
                
@@ -104,7 +104,7 @@ PlayerVideoFrame::image () const
                break;
        }
                
-       shared_ptr<Image> out = im->crop_scale_window (total_crop, _inter_size, _out_size, _scaler, PIX_FMT_RGB24, false);
+       shared_ptr<Image> out = im->crop_scale_window (total_crop, _inter_size, _out_size, _scaler, PIX_FMT_RGB24, true);
 
        Position<int> const container_offset ((_out_size.width - _inter_size.width) / 2, (_out_size.height - _inter_size.width) / 2);