diff options
| author | Carl Hetherington <cth@carlh.net> | 2016-06-14 09:34:09 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2016-06-14 09:34:09 +0100 |
| commit | 3d6501346b187f35d0f55d16e13f8817f505a82f (patch) | |
| tree | f57c153b99a5301de3e7024bc414706749974d0a /test | |
| parent | cd29c4ed26fde9b9c07190f92205705b13c6bd73 (diff) | |
| parent | 6b9c1b3bdec2b4396314ccf6bf2d5aeaa5402ae6 (diff) | |
Merge branch 'master' of ssh://git.carlh.net/home/carl/git/dcpomatic
Diffstat (limited to 'test')
| -rw-r--r-- | test/time_calculation_test.cc | 2 | ||||
| -rw-r--r-- | test/wscript | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/test/time_calculation_test.cc b/test/time_calculation_test.cc index 3d602c0f0..ddd685d0c 100644 --- a/test/time_calculation_test.cc +++ b/test/time_calculation_test.cc @@ -43,7 +43,7 @@ static string const xml = "<Content>" "<VideoWidth>1280</VideoWidth>" "<VideoHeight>720</VideoHeight>" "<VideoFrameRate>25</VideoFrameRate>" - "<VideoFrameType>0</VideoFrameType>" + "<VideoFrameType>2d</VideoFrameType>" "<LeftCrop>0</LeftCrop>" "<RightCrop>0</RightCrop>" "<TopCrop>0</TopCrop>" diff --git a/test/wscript b/test/wscript index b7ac654cd..771651236 100644 --- a/test/wscript +++ b/test/wscript @@ -34,7 +34,7 @@ def build(bld): obj = bld(features='cxx cxxprogram') obj.name = 'unit-tests' obj.uselib = 'BOOST_TEST BOOST_THREAD BOOST_FILESYSTEM BOOST_DATETIME SNDFILE SAMPLERATE DCP FONTCONFIG CAIROMM PANGOMM XMLPP ' - obj.uselib += 'AVFORMAT AVFILTER AVCODEC AVUTIL SWSCALE POSTPROC CXML MAGICK SUB GLIB CURL SSH XMLSEC BOOST_REGEX ICU ' + obj.uselib += 'AVFORMAT AVFILTER AVCODEC AVUTIL SWSCALE POSTPROC CXML MAGICK SUB GLIB CURL SSH XMLSEC BOOST_REGEX ICU NETTLE ' if bld.env.TARGET_WINDOWS: obj.uselib += 'WINSOCK2' obj.use = 'libdcpomatic2' |