diff options
| author | Carl Hetherington <cth@carlh.net> | 2018-11-06 22:43:52 +0000 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2018-11-06 22:43:52 +0000 |
| commit | ed68bfad5c795afb342c5228f3c1dc7770a6d646 (patch) | |
| tree | ebf0a5b7f2c9b1636c498715f0f7aaaf8dcc98f7 /src/lib/ffmpeg_file_encoder.cc | |
| parent | e5b744922fb6aed65ec13f22a9de0c86dd1bd561 (diff) | |
Switch PlayerVideo::always_rgb to a new ::force and use it in FFmpegFileEncoder.
Diffstat (limited to 'src/lib/ffmpeg_file_encoder.cc')
| -rw-r--r-- | src/lib/ffmpeg_file_encoder.cc | 8 |
1 files changed, 1 insertions, 7 deletions
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 ); |