Merge 1.0 in.

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

diff --git a/src/lib/image.h b/src/lib/image.h
index cc0baf9219782e818375801a1c57773d3dc7d6cc..6af74a8c5ee16e641c817f27361b4757118e1295 100644 (file)
--- a/src/lib/image.h
+++ b/src/lib/image.h
@@ -57,8 +57,7 @@ public:
        int line_factor (int) const;
        int lines (int) const;
 
-       boost::shared_ptr<Image> scale_and_convert_to_rgb (libdcp::Size, Scaler const *, bool) const;
-       boost::shared_ptr<Image> scale (libdcp::Size, Scaler const *, bool aligned) const;
+       boost::shared_ptr<Image> scale (libdcp::Size, Scaler const *, AVPixelFormat, bool aligned) const;
        boost::shared_ptr<Image> post_process (std::string, bool aligned) const;
        void alpha_blend (boost::shared_ptr<const Image> image, Position<int> pos);
        void copy (boost::shared_ptr<const Image> image, Position<int> pos);