Merge branch 'master' into 12bit
authorCarl Hetherington <cth@carlh.net>
Thu, 16 Oct 2014 15:30:11 +0000 (16:30 +0100)
committerCarl Hetherington <cth@carlh.net>
Thu, 16 Oct 2014 15:30:11 +0000 (16:30 +0100)
commit0b6c6de07f9a3aa28c2e8ca8ef30340e3fa1bfc6
tree075a7a604bbd4e072ec1b07481d4eb82ed7ffd34
parent42a122334d594b824c666e5263168386a76801cc
parent016a98b18d01276a1e603885a25785e7389f14d9
Merge branch 'master' into 12bit
src/lib/dcp_video_frame.cc
src/lib/image.cc
src/wx/film_viewer.cc