X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=test%2Fthreed_test.cc;h=bceb6700fe1d7bad834626dba3ea5569e1b73f1f;hb=3d40a861b4e77f04df7196cffda5b41b9852b2c7;hp=f98464fb5810329d20a6a6903ed2b175bc4fb9b6;hpb=39fb8198febde1937019db1c300ec363aab5aa56;p=dcpomatic.git

diff --git a/test/threed_test.cc b/test/threed_test.cc
index f98464fb5..bceb6700f 100644
--- a/test/threed_test.cc
+++ b/test/threed_test.cc
@@ -105,6 +105,11 @@ BOOST_AUTO_TEST_CASE (threed_test3)
 
 BOOST_AUTO_TEST_CASE (threed_test4)
 {
+	ConfigRestorer cr;
+
+	/* Try to stop out-of-memory crashes on my laptop */
+	Config::instance()->set_master_encoding_threads (boost::thread::hardware_concurrency() / 4);
+
 	auto film = new_test_film2 ("threed_test4");
 	auto L = make_shared<FFmpegContent>(TestPaths::private_data() / "LEFT_TEST_DCP3D4K.mov");
 	film->examine_and_add_content (L);
@@ -181,7 +186,7 @@ BOOST_AUTO_TEST_CASE (threed_test7)
 	c->video->set_length (24);
 
 	film->set_three_d (true);
-	film->make_dcp ();
+	film->make_dcp (TranscodeJob::ChangedBehaviour::IGNORE);
 	film->write_metadata ();
 
 	auto jm = JobManager::instance ();