Merge branch 'master' of ssh://git.carlh.net/home/carl/git/dcpomatic
authorCarl Hetherington <cth@carlh.net>
Sun, 24 Jan 2016 23:53:22 +0000 (23:53 +0000)
committerCarl Hetherington <cth@carlh.net>
Sun, 24 Jan 2016 23:53:22 +0000 (23:53 +0000)
1  2 
src/lib/video_decoder.cc

Simple merge