Merge master.

1 files changed, 1 insertions, 8 deletions

diff --git a/src/tools/dcpomatic_cli.cc b/src/tools/dcpomatic_cli.cc
index d95b2ed99..acd1335e6 100644
--- a/src/tools/dcpomatic_cli.cc
+++ b/src/tools/dcpomatic_cli.cc
@@ -65,7 +65,6 @@ main (int argc, char* argv[])
 	string film_dir;
 	bool progress = true;
 	bool no_remote = false;
-	int log_level = 0;
 	int json_port = 0;
 	bool keep_going = false;
 
@@ -78,13 +77,12 @@ main (int argc, char* argv[])
 			{ "flags", no_argument, 0, 'f'},
 			{ "no-progress", no_argument, 0, 'n'},
 			{ "no-remote", no_argument, 0, 'r'},
-			{ "log-level", required_argument, 0, 'l' },
 			{ "json", required_argument, 0, 'j' },
 			{ "keep-going", no_argument, 0, 'k' },
 			{ 0, 0, 0, 0 }
 		};
 
-		int c = getopt_long (argc, argv, "vhdfnrl:j:k", long_options, &option_index);
+		int c = getopt_long (argc, argv, "vhdfnrj:k", long_options, &option_index);
 
 		if (c == -1) {
 			break;
@@ -109,9 +107,6 @@ main (int argc, char* argv[])
 		case 'r':
 			no_remote = true;
 			break;
-		case 'l':
-			log_level = atoi (optarg);
-			break;
 		case 'j':
 			json_port = atoi (optarg);
 			break;
@@ -155,8 +150,6 @@ main (int argc, char* argv[])
 		exit (EXIT_FAILURE);
 	}
 
-	film->log()->set_level ((Log::Level) log_level);
-
 	cout << "\nMaking DCP for " << film->name() << "\n";
 //	cout << "Content: " << film->content() << "\n";
 //	pair<string, string> const f = Filter::ffmpeg_strings (film->filters ());