Tidy up careful_string_filter and add some extra transliterations.

[dcpomatic.git] / src / lib / ffmpeg_file_encoder.cc

diff --git a/src/lib/ffmpeg_file_encoder.cc b/src/lib/ffmpeg_file_encoder.cc
index 6f13f5dd606eff5375c8b2338e8ade11a6e47353..62242d65c2a582d438f0827b67ec02290d58213b 100644 (file)
--- a/src/lib/ffmpeg_file_encoder.cc
+++ b/src/lib/ffmpeg_file_encoder.cc
@@ -127,7 +127,7 @@ public:
                return false;
        }
 
-       void write (int size, int channel_offset, int channels, float** data, int64_t sample_offset)
+       void write (int size, int channel_offset, int channels, float* const* data, int64_t sample_offset)
        {
                DCPOMATIC_ASSERT (size);
 
@@ -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
                );