Merge branch 'master' of git.carlh.net:git/dcpomatic

diff --combined wscript
index d9d410ae27c37585b380d5f99e27f24c9c6f6bbf,404be26d2e6bb4e3923dbc300381d63da0c8deb5..784cb777ed4b328b7fd963ccd61a6621860e3c4a
--- 1/wscript
--- 2/wscript
+++ b/wscript
@@@ -3,7 -3,7 +3,7 @@@ import o
  import sys
  
  APPNAME = 'dcpomatic'
- VERSION = '1.74.2devel'
+ VERSION = '1.74.3devel'
  
  def options(opt):
      opt.load('compiler_cxx')
@@@ -28,8 -28,7 +28,8 @@@ def static_ffmpeg(conf)
      conf.check_cfg(package='libavfilter', args='--cflags', uselib_store='AVFILTER', mandatory=True)
      conf.env.STLIB_AVFILTER = ['avfilter', 'swresample']
      conf.check_cfg(package='libavcodec', args='--cflags', uselib_store='AVCODEC', mandatory=True)
 -    conf.env.STLIB_AVCODEC = ['avcodec']
 +    # lzma link is needed by Centos 7, at least
 +    conf.env.STLIB_AVCODEC = ['avcodec', 'lzma']
      conf.env.LIB_AVCODEC = ['z']
      conf.check_cfg(package='libavutil', args='--cflags', uselib_store='AVUTIL', mandatory=True)
      conf.env.STLIB_AVUTIL = ['avutil']