Various stuff; mostly change to decoder scaling and adding subtitle; scaling test.

1 files changed, 2 insertions, 4 deletions

diff --git a/src/lib/util.cc b/src/lib/util.cc
index e1bc560c6..71a21105b 100644
--- a/src/lib/util.cc
+++ b/src/lib/util.cc
@@ -56,12 +56,11 @@ extern "C" {
 #include "util.h"
 #include "exceptions.h"
 #include "scaler.h"
-#include "format.h"
 #include "dcp_content_type.h"
 #include "filter.h"
 #include "sound_processor.h"
 #include "config.h"
-#include "container.h"
+#include "ratio.h"
 #ifdef DVDOMATIC_WINDOWS
 #include "stack.hpp"
 #endif
@@ -285,8 +284,7 @@ dcpomatic_setup ()
 	
 	avfilter_register_all ();
 	
-	Format::setup_formats ();
-	Container::setup_containers ();
+	Ratio::setup_ratios ();
 	DCPContentType::setup_dcp_content_types ();
 	Scaler::setup_scalers ();
 	Filter::setup_filters ();