Try to capture ffmpeg logs during tests.

diff --git a/src/lib/util.cc b/src/lib/util.cc
index be5ab5b953d4544929db1881c64a78ec786d3307..05b69644f1ed95616eb4a8e0f4cde7ebdc85e0be 100644 (file)
--- a/src/lib/util.cc
+++ b/src/lib/util.cc
@@ -408,7 +408,6 @@ ffmpeg_log_callback(void* ptr, int level, const char* fmt, va_list vl)
 }
 
 
-static
 void
 capture_ffmpeg_logs()
 {

diff --git a/src/lib/util.h b/src/lib/util.h
index 4c8a2b1b7f4bba978c05c1a1f13ad9c41e6d66b3..b92869b253a776167c72bbd1b20159a1a9015e4e 100644 (file)
--- a/src/lib/util.h
+++ b/src/lib/util.h
@@ -96,5 +96,6 @@ extern void start_of_thread (std::string name);
 extern std::string error_details(boost::system::error_code ec);
 extern bool contains_assetmap(boost::filesystem::path dir);
 extern std::string word_wrap(std::string input, int columns);
+extern void capture_ffmpeg_logs();
 
 #endif

diff --git a/test/test.cc b/test/test.cc
index 1739e8e899e4750ff1021f7264ea0dfe65e4fce7..402894cb17728f96f8640e4657384461c5ddbe7c 100644 (file)
--- a/test/test.cc
+++ b/test/test.cc
@@ -157,6 +157,7 @@ struct TestConfig
 
                dcpomatic_setup ();
                setup_test_config ();
+               capture_ffmpeg_logs();
 
                EncodeServerFinder::instance()->stop ();