Remove functors for choosing pixel format output from make_image().

1 files changed, 3 insertions, 6 deletions

diff --git a/src/lib/player_video.h b/src/lib/player_video.h
index e2968749c..32e462c5f 100644
--- a/src/lib/player_video.h
+++ b/src/lib/player_video.h
@@ -75,13 +75,10 @@ public:
 		return _text;
 	}
 
-	void prepare (std::function<AVPixelFormat (AVPixelFormat)> pixel_format, VideoRange video_range, Image::Alignment alignment, bool fast, bool proxy_only);
-	std::shared_ptr<Image> image (std::function<AVPixelFormat (AVPixelFormat)> pixel_format, VideoRange video_range, bool fast) const;
+	void prepare(AVPixelFormat pixel_format, VideoRange video_range, Image::Alignment alignment, bool fast, bool proxy_only);
+	std::shared_ptr<Image> image(AVPixelFormat pixel_format, VideoRange video_range, bool fast) const;
 	std::shared_ptr<const Image> raw_image () const;
 
-	static AVPixelFormat force (AVPixelFormat);
-	static AVPixelFormat keep_xyz_or_rgb (AVPixelFormat);
-
 	void add_metadata(xmlpp::Element* element) const;
 	void write_to_socket (std::shared_ptr<Socket> socket) const;
 
@@ -127,7 +124,7 @@ public:
 	}
 
 private:
-	void make_image (std::function<AVPixelFormat (AVPixelFormat)> pixel_format, VideoRange video_range, bool fast) const;
+	void make_image(AVPixelFormat pixel_format, VideoRange video_range, bool fast) const;
 
 	std::shared_ptr<const ImageProxy> _in;
 	Crop _crop;