Merge master branch.

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

diff --git a/src/lib/util.cc b/src/lib/util.cc
index 0e250bb0885bfecde170a8fa5dd97a3690c906fe..872985024ac9a5779bfab4f9fa6fdd4988984047 100644 (file)
--- a/src/lib/util.cc
+++ b/src/lib/util.cc
@@ -247,7 +247,7 @@ dvdomatic_setup ()
  *  @return FFmpeg crop filter string.
  */
 string
-crop_string (Position start, Size size)
+crop_string (Position start, libdcp::Size size)
 {
        stringstream s;
        s << "crop=" << size.width << ":" << size.height << ":" << start.x << ":" << start.y;
@@ -455,7 +455,6 @@ dcp_audio_channels (int f)
        return f;
 }
 
-
 bool operator== (Crop const & a, Crop const & b)
 {
        return (a.left == b.left && a.right == b.right && a.top == b.top && a.bottom == b.bottom);