Merge branch 'fix-encoder-threading' of ssh://git.carlh.net/home/carl/git/dcpomatic...
authorCarl Hetherington <cth@carlh.net>
Mon, 20 Jun 2016 16:16:20 +0000 (17:16 +0100)
committerCarl Hetherington <cth@carlh.net>
Mon, 20 Jun 2016 16:16:20 +0000 (17:16 +0100)

Trivial merge