Merge master.
authorCarl Hetherington <cth@carlh.net>
Thu, 12 Jun 2014 21:27:50 +0000 (22:27 +0100)
committerCarl Hetherington <cth@carlh.net>
Thu, 12 Jun 2014 21:27:50 +0000 (22:27 +0100)
commit04533b9cf34ce8089113015715083ee9c5b2b001
tree582334f3740be291a78cc97de403b4295d8847c1
parent4e411ea97b4dab8a5fa282d1d4cf7971ef1e24ad
parent51f1885e63193b8ab62a51089298c3711269d2a3
Merge master.
ChangeLog
src/lib/video_content.cc
src/lib/video_content.h
src/tools/dcpomatic.cc