Merge master.

[dcpomatic.git] / src / lib / film.cc

diff --git a/src/lib/film.cc b/src/lib/film.cc
index 5481bd012a322d2390668ef8034fb6b14b17d912..8fed87122977bdf311d9640f1cd2c8a4d92ab496 100644 (file)
--- a/src/lib/film.cc
+++ b/src/lib/film.cc
@@ -93,8 +93,8 @@ Film::Film (string d, bool must_exist)
        : _playlist (new Playlist)
        , _use_dci_name (true)
        , _trust_content_headers (true)
-       , _dcp_content_type (0)
-       , _format (Format::from_id ("185"))
+       , _dcp_content_type (Config::instance()->default_dcp_content_type ())
+       , _format (Config::instance()->default_format ())
        , _scaler (Scaler::from_id ("bicubic"))
        , _trim_start (0)
        , _trim_end (0)