5 files changed, 10 insertions, 7 deletions
diff --git a/src/tools/dcpomatic.cc b/src/tools/dcpomatic.cc
index 5f723ba0f..de4ddebc2 100644
--- a/src/tools/dcpomatic.cc
+++ b/src/tools/dcpomatic.cc
@@ -76,7 +76,7 @@
 #include "lib/email.h"
 #include "lib/encode_server_finder.h"
 #include "lib/exceptions.h"
-#include "lib/ffmpeg_encoder.h"
+#include "lib/ffmpeg_film_encoder.h"
 #include "lib/film.h"
 #include "lib/font_config.h"
 #ifdef DCPOMATIC_GROK
@@ -91,7 +91,7 @@
 #include "lib/screen.h"
 #include "lib/send_kdm_email_job.h"
 #include "lib/signal_manager.h"
-#include "lib/subtitle_encoder.h"
+#include "lib/subtitle_film_encoder.h"
 #include "lib/text_content.h"
 #include "lib/transcode_job.h"
 #include "lib/update_checker.h"
@@ -1029,7 +1029,7 @@ private:
 
 		auto job = make_shared<TranscodeJob>(_film, TranscodeJob::ChangedBehaviour::EXAMINE_THEN_STOP);
 		job->set_encoder (
-			make_shared<FFmpegEncoder> (
+			make_shared<FFmpegFilmEncoder>(
 				_film, job, dialog.path(), dialog.format(), dialog.mixdown_to_stereo(), dialog.split_reels(), dialog.split_streams(), dialog.x264_crf())
 			);
 		JobManager::instance()->add (job);
@@ -1044,7 +1044,7 @@ private:
 		}
 		auto job = make_shared<TranscodeJob>(_film, TranscodeJob::ChangedBehaviour::EXAMINE_THEN_STOP);
 		job->set_encoder(
-			make_shared<SubtitleEncoder>(_film, job, dialog.path(), _film->isdcf_name(true), dialog.split_reels(), dialog.include_font())
+			make_shared<SubtitleFilmEncoder>(_film, job, dialog.path(), _film->isdcf_name(true), dialog.split_reels(), dialog.include_font())
 			);
 		JobManager::instance()->add(job);
 	}
diff --git a/src/tools/dcpomatic_cli.cc b/src/tools/dcpomatic_cli.cc
index c087f89e7..49caf5cb2 100644
--- a/src/tools/dcpomatic_cli.cc
+++ b/src/tools/dcpomatic_cli.cc
@@ -25,7 +25,7 @@
 #include "lib/cross.h"
 #include "lib/dcpomatic_log.h"
 #include "lib/encode_server_finder.h"
-#include "lib/ffmpeg_encoder.h"
+#include "lib/ffmpeg_film_encoder.h"
 #include "lib/film.h"
 #include "lib/filter.h"
 #ifdef DCPOMATIC_GROK
@@ -94,7 +94,7 @@ print_dump (shared_ptr<Film> film)
 {
 	cout << film->dcp_name (true) << "\n"
 	     << film->container()->container_nickname() << " at " << ((film->resolution() == Resolution::TWO_K) ? "2K" : "4K") << "\n"
-	     << (film->j2k_bandwidth() / 1000000) << "Mbit/s" << "\n"
+	     << (film->video_bit_rate(film->video_encoding()) / 1000000) << "Mbit/s" << "\n"
 	     << "Duration " << (film->length().timecode(film->video_frame_rate())) << "\n"
 	     << "Output " << film->video_frame_rate() << "fps " << (film->three_d() ? "3D" : "2D") << " " << (film->audio_frame_rate() / 1000) << "kHz\n"
 	     << (film->interop() ? "Inter-Op" : "SMPTE") << " " << (film->encrypted() ? "encrypted" : "unencrypted") << "\n";
@@ -519,7 +519,7 @@ main (int argc, char* argv[])
 	if (export_format) {
 		auto job = std::make_shared<TranscodeJob>(film, behaviour);
 		job->set_encoder (
-			std::make_shared<FFmpegEncoder> (
+			std::make_shared<FFmpegFilmEncoder>(
 				film, job, *export_filename, *export_format == "mp4" ? ExportFormat::H264_AAC : ExportFormat::PRORES_HQ, false, false, false, 23
 				)
 			);
diff --git a/src/tools/dcpomatic_combiner.cc b/src/tools/dcpomatic_combiner.cc
index 6588b23b4..a28e063e5 100644
--- a/src/tools/dcpomatic_combiner.cc
+++ b/src/tools/dcpomatic_combiner.cc
@@ -30,6 +30,7 @@
 #include "lib/constants.h"
 #include "lib/cross.h"
 #include "lib/job_manager.h"
+#include "lib/util.h"
 #include <dcp/combine.h>
 LIBDCP_DISABLE_WARNINGS
 #include <wx/filepicker.h>
diff --git a/src/tools/dcpomatic_editor.cc b/src/tools/dcpomatic_editor.cc
index e1f541fe8..fc04ce017 100644
--- a/src/tools/dcpomatic_editor.cc
+++ b/src/tools/dcpomatic_editor.cc
@@ -29,6 +29,7 @@
 #include "lib/cross.h"
 #include "lib/dcpomatic_log.h"
 #include "lib/null_log.h"
+#include "lib/util.h"
 #include "lib/variant.h"
 #include <dcp/cpl.h>
 #include <dcp/dcp.h>
diff --git a/src/tools/dcpomatic_kdm.cc b/src/tools/dcpomatic_kdm.cc
index d6c8b3945..1eda05162 100644
--- a/src/tools/dcpomatic_kdm.cc
+++ b/src/tools/dcpomatic_kdm.cc
@@ -53,6 +53,7 @@
 #include "lib/kdm_with_metadata.h"
 #include "lib/screen.h"
 #include "lib/send_kdm_email_job.h"
+#include "lib/util.h"
 #include "lib/variant.h"
 #include <dcp/encrypted_kdm.h>
 #include <dcp/decrypted_kdm.h>