Merge master.

diff --cc cscript
index e8154e9f3f9192b1718cdcc418c351a62ad5f9ea,4c54b03774fa8f8a9930aa45bef3269395b887ba..521bc54f9c20691ab214c0ba5fed3741a6a1eead
--- 1/cscript
--- 2/cscript
+++ b/cscript
@@@ -7,8 -7,8 +7,8 @@@ def dependencies(target)
          return ()
      else:
          return (('openjpeg-cdist', None),
 -                ('ffmpeg-cdist', '488d5d4496af5e3a3b9d31d6b221e8eeada6b77e'),
 +                ('ffmpeg-cdist', '7a23ec9c771184ab563cfe24ad9b427f38368961'),
-                 ('libdcp', 'v0.45'))
+                 ('libdcp', 'v0.49'))
  
  def build(env, target):
      cmd = './waf configure --prefix=%s' % env.work_dir_cscript()

diff --cc src/lib/wscript
Simple merge

diff --cc wscript
Simple merge