Put Image in dcpomatic:: to avoid Fastvideo name clash.

[dcpomatic.git] / src / lib / player_video.cc

diff --git a/src/lib/player_video.cc b/src/lib/player_video.cc
index cb2a55724726cb46803ad29f2178a620759ada6d..1a4c9028d3c186dd887dae15c8975556329f5fd0 100644 (file)
--- a/src/lib/player_video.cc
+++ b/src/lib/player_video.cc
@@ -42,6 +42,7 @@ using boost::optional;
 using boost::function;
 using dcp::Data;
 using dcp::raw_convert;
+using namespace dcpomatic;
 
 PlayerVideo::PlayerVideo (
        shared_ptr<const ImageProxy> in,
@@ -339,7 +340,7 @@ PlayerVideo::reset_metadata (shared_ptr<const Film> film, dcp::Size video_contai
 
        _crop = content->video->crop();
        _fade = content->video->fade(film, _video_frame.get());
-       _inter_size = content->video->scale().size(content->video, video_container_size, film_frame_size);
+       _inter_size = scale_for_display(content->video->scaled_size(film_frame_size), video_container_size, film_frame_size);
        _out_size = video_container_size;
        _colour_conversion = content->video->colour_conversion();
        _video_range = content->video->range();