summaryrefslogtreecommitdiff
path: root/src/lib
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2022-04-04 00:42:57 +0200
committerCarl Hetherington <cth@carlh.net>2022-04-07 22:13:11 +0200
commit4f9314a311de379b105741273a15821da62a75cc (patch)
tree2b1729af02ff971ac2fbe2ab40cdf8ff0c35d00f /src/lib
parent547ee025d195f5881c7807f5373f3a52c490ada9 (diff)
Cleanup: remove unused parameter to PlayerVideo::force.
Diffstat (limited to 'src/lib')
-rw-r--r--src/lib/ffmpeg_encoder.cc2
-rw-r--r--src/lib/ffmpeg_file_encoder.cc2
-rw-r--r--src/lib/player_video.cc2
-rw-r--r--src/lib/player_video.h2
4 files changed, 4 insertions, 4 deletions
diff --git a/src/lib/ffmpeg_encoder.cc b/src/lib/ffmpeg_encoder.cc
index 81ea3a9dd..8f36bbda1 100644
--- a/src/lib/ffmpeg_encoder.cc
+++ b/src/lib/ffmpeg_encoder.cc
@@ -108,7 +108,7 @@ FFmpegEncoder::FFmpegEncoder (
}
_butler = std::make_shared<Butler>(
- _film, _player, map, _output_audio_channels, bind(&PlayerVideo::force, _1, FFmpegFileEncoder::pixel_format(format)), VideoRange::VIDEO, Image::Alignment::PADDED, false, false
+ _film, _player, map, _output_audio_channels, bind(&PlayerVideo::force, FFmpegFileEncoder::pixel_format(format)), VideoRange::VIDEO, Image::Alignment::PADDED, false, false
);
}
diff --git a/src/lib/ffmpeg_file_encoder.cc b/src/lib/ffmpeg_file_encoder.cc
index 6f13f5dd6..57103abc7 100644
--- a/src/lib/ffmpeg_file_encoder.cc
+++ b/src/lib/ffmpeg_file_encoder.cc
@@ -399,7 +399,7 @@ FFmpegFileEncoder::video (shared_ptr<PlayerVideo> video, DCPTime time)
{
/* All our output formats are video range at the moment */
auto image = video->image (
- bind (&PlayerVideo::force, _1, _pixel_format),
+ bind (&PlayerVideo::force, _pixel_format),
VideoRange::VIDEO,
false
);
diff --git a/src/lib/player_video.cc b/src/lib/player_video.cc
index 081147434..d45bf9f43 100644
--- a/src/lib/player_video.cc
+++ b/src/lib/player_video.cc
@@ -298,7 +298,7 @@ PlayerVideo::same (shared_ptr<const PlayerVideo> other) const
AVPixelFormat
-PlayerVideo::force (AVPixelFormat, AVPixelFormat force_to)
+PlayerVideo::force (AVPixelFormat force_to)
{
return force_to;
}
diff --git a/src/lib/player_video.h b/src/lib/player_video.h
index 237d2e3fe..f2781c1a0 100644
--- a/src/lib/player_video.h
+++ b/src/lib/player_video.h
@@ -79,7 +79,7 @@ public:
std::shared_ptr<Image> image (std::function<AVPixelFormat (AVPixelFormat)> pixel_format, VideoRange video_range, bool fast) const;
std::shared_ptr<const Image> raw_image () const;
- static AVPixelFormat force (AVPixelFormat, AVPixelFormat);
+ static AVPixelFormat force (AVPixelFormat);
static AVPixelFormat keep_xyz_or_rgb (AVPixelFormat);
void add_metadata (xmlpp::Node* node) const;