X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Ftools%2Fdcpomatic_cli.cc;h=9eec498f975d72d2dad73552cd2987c3d8fa71f4;hb=1fc8c0c6d045404732497ba70bd2eccfbe4cc6f6;hp=c2e7ee76cf3c35860c7ab8982c19e0b5dcfbc0ae;hpb=6df70fd09ea8dcdef689a9e5611179d57090eb20;p=dcpomatic.git

diff --git a/src/tools/dcpomatic_cli.cc b/src/tools/dcpomatic_cli.cc
index c2e7ee76c..9eec498f9 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
@@ -40,6 +40,7 @@
 #include "lib/signal_manager.h"
 #include "lib/transcode_job.h"
 #include "lib/util.h"
+#include "lib/variant.h"
 #include "lib/version.h"
 #include "lib/video_content.h"
 #include <dcp/filesystem.h>
@@ -66,7 +67,7 @@ static void
 help (string n)
 {
 	cerr << "Syntax: " << n << " [OPTION] [<FILM>]\n"
-	     << "  -v, --version                     show DCP-o-matic version\n"
+	     << variant::insert_dcpomatic("  -v, --version                     show %1 version\n")
 	     << "  -h, --help                        show this help\n"
 	     << "  -f, --flags                       show flags passed to C++ compiler on build\n"
 	     << "  -n, --no-progress                 do not print progress to stdout\n"
@@ -75,7 +76,7 @@ help (string n)
 	     << "  -j, --json <port>                 run a JSON server on the specified port\n"
 	     << "  -k, --keep-going                  keep running even when the job is complete\n"
 	     << "  -s, --servers <file>              specify servers to use in a text file\n"
-	     << "  -l, --list-servers                just display a list of encoding servers that DCP-o-matic is configured to use; don't encode\n"
+	     << variant::insert_dcpomatic("  -l, --list-servers                just display a list of encoding servers that %1 is configured to use; don't encode\n")
 	     << "  -d, --dcp-path                    echo DCP's path to stdout on successful completion (implies -n)\n"
 	     << "  -c, --config <dir>                directory containing config.xml and cinemas.xml\n"
 	     << "      --dump                        just dump a summary of the film's settings; don't encode\n"
@@ -518,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
 				)
 			);