Remove default DCP content type setting.

3 files changed, 0 insertions, 6 deletions

diff --git a/test/create_cli_test.cc b/test/create_cli_test.cc
index 1be37c253..8ce19d5a2 100644
--- a/test/create_cli_test.cc
+++ b/test/create_cli_test.cc
@@ -301,10 +301,5 @@ BOOST_AUTO_TEST_CASE(create_cli_defaults_test)
 	auto cc = run("dcpomatic2_create test/data/flat_red.png");
 	auto film = cc.make_film();
 	BOOST_CHECK(!film->interop());
-
-	Config::instance()->set_default_dcp_content_type(DCPContentType::from_isdcf_name("FT"));
-	cc = run("dcpomatic2_create test/data/flat_red.png");
-	film = cc.make_film();
-	BOOST_CHECK_EQUAL(film->dcp_content_type()->isdcf_name(), "TST");
 }
 
diff --git a/test/data b/test/data
-Subproject fe54acfc54d02a8e7b033117644d2dd4ab17d7c
+Subproject d511a06d5124f7d688b5fed8445c53c2fe08e5b
diff --git a/test/test.cc b/test/test.cc
index 8d92b31e4..c145a8b4d 100644
--- a/test/test.cc
+++ b/test/test.cc
@@ -120,7 +120,6 @@ setup_test_config ()
 	Config::instance()->set_master_encoding_threads (boost::thread::hardware_concurrency() / 2);
 	Config::instance()->set_server_encoding_threads (1);
 	Config::instance()->set_server_port_base (61921);
-	Config::instance()->set_default_dcp_content_type (static_cast<DCPContentType*> (0));
 	Config::instance()->set_default_audio_delay (0);
 	Config::instance()->set_default_video_bit_rate(VideoEncoding::JPEG2000, 100000000);
 	Config::instance()->set_default_interop (false);