Merge master.

diff --cc ChangeLog
Simple merge

diff --cc src/lib/config.cc
index 1f5a25ae4dcb52f785930d8948bb5998f25dbb23,878fedaa4c31ed394bad0c43819ea7f961c1fdcb..114fc5c274c7753cdc0f2e0f721603ecaf47cd12
--- 1/src/lib/config.cc
--- 2/src/lib/config.cc
+++ b/src/lib/config.cc
@@@ -64,10 -61,10 +64,10 @@@ Config::Config (
        , _server_port_base (6192)
        , _use_any_servers (true)
        , _tms_path (".")
 -      , _sound_processor (SoundProcessor::from_id (N_("dolby_cp750")))
 +      , _cinema_sound_processor (CinemaSoundProcessor::from_id (N_("dolby_cp750")))
        , _allow_any_dcp_frame_rate (false)
        , _default_still_length (10)
-       , _default_scale (Ratio::from_id ("185"))
+       , _default_scale (VideoContentScale (Ratio::from_id ("185")))
        , _default_container (Ratio::from_id ("185"))
        , _default_dcp_content_type (DCPContentType::from_isdcf_name ("TST"))
        , _default_j2k_bandwidth (100000000)

diff --cc src/lib/config.h
index 9a18086829af77194d973941399b93ee80c1a52a,0639382a05040abc85e7e4fc1a9075a591dd974c..99b3eb62122e00529502db5100f5e069a35c4c3e
--- 1/src/lib/config.h
--- 2/src/lib/config.h
+++ b/src/lib/config.h
@@@ -28,11 -28,10 +28,12 @@@
  #include <boost/shared_ptr.hpp>
  #include <boost/signals2.hpp>
  #include <boost/filesystem.hpp>
 +#include <dcp/metadata.h>
 +#include <dcp/certificates.h>
 +#include <dcp/signer.h>
  #include "isdcf_metadata.h"
  #include "colour_conversion.h"
 -#include "server.h"
+ #include "video_content.h"
  
  class ServerDescription;
  class Scaler;

diff --cc src/lib/video_content.cc
Simple merge

diff --cc src/lib/video_content.h
Simple merge

diff --cc src/tools/dcpomatic.cc
Simple merge

diff --cc src/wx/config_dialog.cc
Simple merge