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)
commitad401edb701117f5aa6586239ef803b74ac3fb35
tree51bf7b0ba6939a44ca8e9802d60f81d2de535d58
parent01884ed880e5519bd9d37db882216a81dfafdf8b
parent41737ca62d65bcd6c25ec1080c0c7e0e6e6ae9b2
Merge branch 'fix-encoder-threading' of ssh://git.carlh.net/home/carl/git/dcpomatic into fix-encoder-threading