Change MagickImageProxy to FFmpegImageProxy and make it use FFmpeg

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

diff --git a/src/lib/raw_image_proxy.h b/src/lib/raw_image_proxy.h
index 9f8424eb34df8061154ee96925b679a8d6939890..5711b54f2f9f362a0ec9a178994d3010af0269e5 100644 (file)
--- a/src/lib/raw_image_proxy.h
+++ b/src/lib/raw_image_proxy.h
@@ -29,7 +29,7 @@ public:
        explicit RawImageProxy (boost::shared_ptr<Image>);
        RawImageProxy (boost::shared_ptr<cxml::Node> xml, boost::shared_ptr<Socket> socket);
 
-       boost::shared_ptr<Image> image (
+       std::pair<boost::shared_ptr<Image>, int> image (
                boost::optional<dcp::NoteHandler> note = boost::optional<dcp::NoteHandler> (),
                boost::optional<dcp::Size> size = boost::optional<dcp::Size> ()
                ) const;
@@ -37,7 +37,6 @@ public:
        void add_metadata (xmlpp::Node *) const;
        void send_binary (boost::shared_ptr<Socket>) const;
        bool same (boost::shared_ptr<const ImageProxy>) const;
-       AVPixelFormat pixel_format () const;
        size_t memory_used () const;
 
 private: