X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fffmpeg_image_proxy.h;h=b2b0260b5437eab63ae99bc66e8d30ad76349ddd;hb=1a721b82d4094c00ee89574e17c58c23c0de8cdd;hp=92689abe89245df278c97cb1b463023d84e681b1;hpb=dd9be86db6cde0afa5da0d1d1ac43b42e05dca26;p=dcpomatic.git

diff --git a/src/lib/ffmpeg_image_proxy.h b/src/lib/ffmpeg_image_proxy.h
index 92689abe8..b2b0260b5 100644
--- a/src/lib/ffmpeg_image_proxy.h
+++ b/src/lib/ffmpeg_image_proxy.h
@@ -27,25 +27,25 @@
 class FFmpegImageProxy : public ImageProxy
 {
 public:
-	explicit FFmpegImageProxy (boost::filesystem::path, VideoRange video_range);
-	explicit FFmpegImageProxy (dcp::ArrayData, VideoRange video_range);
-	FFmpegImageProxy (std::shared_ptr<cxml::Node> xml, std::shared_ptr<Socket> socket);
+	explicit FFmpegImageProxy (boost::filesystem::path);
+	explicit FFmpegImageProxy (dcp::ArrayData);
+	FFmpegImageProxy (std::shared_ptr<Socket> socket);
 
 	Result image (
+		Image::Alignment alignment,
 		boost::optional<dcp::Size> size = boost::optional<dcp::Size> ()
-		) const;
+		) const override;
 
-	void add_metadata (xmlpp::Node *) const;
-	void write_to_socket (std::shared_ptr<Socket>) const;
-	bool same (std::shared_ptr<const ImageProxy> other) const;
-	size_t memory_used () const;
+	void add_metadata (xmlpp::Node *) const override;
+	void write_to_socket (std::shared_ptr<Socket>) const override;
+	bool same (std::shared_ptr<const ImageProxy> other) const override;
+	size_t memory_used () const override;
 
 	int avio_read (uint8_t* buffer, int const amount);
 	int64_t avio_seek (int64_t const pos, int whence);
 
 private:
 	dcp::ArrayData _data;
-	VideoRange _video_range;
 	mutable int64_t _pos;
 	/** Path of a file that this image came from, if applicable; stored so that
 	    failed-decode errors can give more detail.