X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fvideo_content_scale.h;h=74e91e78f6549c0e85672aa74a987f4f27ecd585;hb=ae15eeca8588c6928d7671894db98c2e289fa601;hp=d457d82f155465257490093f6f1418e8a42be2ef;hpb=c3d85016ac7c41925965513613b5049c1ee9237e;p=dcpomatic.git

diff --git a/src/lib/video_content_scale.h b/src/lib/video_content_scale.h
index d457d82f1..74e91e78f 100644
--- a/src/lib/video_content_scale.h
+++ b/src/lib/video_content_scale.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2013-2014 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2013-2015 Carl Hetherington <cth@carlh.net>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -20,9 +20,9 @@
 #ifndef DCPOMATIC_VIDEO_CONTENT_SCALE_H
 #define DCPOMATIC_VIDEO_CONTENT_SCALE_H
 
-#include <vector>
-#include <boost/shared_ptr.hpp>
 #include <dcp/util.h>
+#include <boost/shared_ptr.hpp>
+#include <vector>
 
 namespace cxml {
 	class Node;
@@ -43,7 +43,7 @@ public:
 	VideoContentScale (bool);
 	VideoContentScale (boost::shared_ptr<cxml::Node>);
 
-	dcp::Size size (boost::shared_ptr<const VideoContent>, dcp::Size, dcp::Size, int round) const;
+	dcp::Size size (boost::shared_ptr<const VideoContent>, dcp::Size display_container, dcp::Size film_container) const;
 	std::string id () const;
 	std::string name () const;
 	void as_xml (xmlpp::Node *) const;