From ed68bfad5c795afb342c5228f3c1dc7770a6d646 Mon Sep 17 00:00:00 2001
From: Carl Hetherington <cth@carlh.net>
Date: Tue, 6 Nov 2018 22:43:52 +0000
Subject: Switch PlayerVideo::always_rgb to a new ::force and use it in
 FFmpegFileEncoder.

---
 src/lib/ffmpeg_file_encoder.cc | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

(limited to 'src/lib/ffmpeg_file_encoder.cc')

diff --git a/src/lib/ffmpeg_file_encoder.cc b/src/lib/ffmpeg_file_encoder.cc
index 52977ad5b..7cc4d26a4 100644
--- a/src/lib/ffmpeg_file_encoder.cc
+++ b/src/lib/ffmpeg_file_encoder.cc
@@ -43,12 +43,6 @@ using boost::weak_ptr;
 int FFmpegFileEncoder::_video_stream_index = 0;
 int FFmpegFileEncoder::_audio_stream_index = 1;
 
-static AVPixelFormat
-force_pixel_format (AVPixelFormat, AVPixelFormat out)
-{
-	return out;
-}
-
 FFmpegFileEncoder::FFmpegFileEncoder (
 	dcp::Size video_frame_size,
 	int video_frame_rate,
@@ -230,7 +224,7 @@ void
 FFmpegFileEncoder::video (shared_ptr<PlayerVideo> video, DCPTime time)
 {
 	shared_ptr<Image> image = video->image (
-		bind (&force_pixel_format, _1, _pixel_format),
+		bind (&PlayerVideo::force, _1, _pixel_format),
 		true,
 		false
 		);
-- 
cgit v1.2.3