Merge branch 'master' of ssh://houllier/home/carl/git/dvdomatic

[dcpomatic.git] / test / test.cc

diff --git a/test/test.cc b/test/test.cc
index 91c876412f74b15af3f6f37eea5fc932cb7d1293..65b1f9056d8ec8cf76bdb32190c278e781681a26 100644 (file)
--- a/test/test.cc
+++ b/test/test.cc
@@ -62,6 +62,8 @@ struct TestConfig
                Config::instance()->set_servers (vector<ServerDescription*> ());
                Config::instance()->set_server_port (61920);
                Config::instance()->set_default_dci_metadata (DCIMetadata ());
+               Config::instance()->set_default_format (static_cast<Format*> (0));
+               Config::instance()->set_default_dcp_content_type (static_cast<DCPContentType*> (0));
        }
 };
 
@@ -101,3 +103,4 @@ new_test_film (string name)
 #include "job_test.cc"
 #include "client_server_test.cc"
 #include "image_test.cc"
+