Merge branch 'fix-encoder-threading' of ssh://git.carlh.net/home/carl/git/dcpomatic...