Merge master.

[dcpomatic.git] / src / lib / format.h

diff --git a/src/lib/format.h b/src/lib/format.h
index 783ff25ce455b31dd207fa4f37026d8fee132a1d..7958ca5341604e199a181b2295e0708b3614d542 100644 (file)
--- a/src/lib/format.h
+++ b/src/lib/format.h
@@ -49,7 +49,7 @@ public:
        /** @return the ratio of the container (including any padding) as a floating point number */
        float container_ratio_as_float () const;
 
-       int dcp_padding (boost::shared_ptr<const Film> f) const;
+       int dcp_padding (boost::shared_ptr<const Film>) const;
 
        /** @return size in pixels of the images that we should
         *  put in a DCP for this ratio.  This size will not correspond