Merge delay-decode-take2 branch into master.

diff --cc cscript
index f2c06779c4fae98493340030decb925872d85e39,39a0c3c0b5154bb15966cc4f592b0609f0e3fd60..4e0f11c645a8653fe6de857519387d20612e2e69
--- 1/cscript
--- 2/cscript
+++ b/cscript
@@@ -144,7 -144,7 +144,7 @@@ def make_control(debian_version, bits, 
  
  def dependencies(target):
      return (('ffmpeg-cdist', 'bba68a5'),
-             ('libdcp', '979739e'))
 -            ('libdcp', 'e9ce9b6'))
++            ('libdcp', '060348d'))
  
  def build(target, options):
      cmd = './waf configure --prefix=%s' % target.work_dir_cscript()