Adapt for changes in parent branch, and test churn.
authorCarl Hetherington <cth@carlh.net>
Sun, 20 Sep 2020 22:53:55 +0000 (00:53 +0200)
committerCarl Hetherington <cth@carlh.net>
Mon, 21 Sep 2020 19:57:18 +0000 (21:57 +0200)
commit4b2b565a03f26c399960416efeed300dd80e401b
tree853c5efe4b1b21290ecdcf2c623d53d2e47df10c
parentcdd98db2de839a5ef14b3c9c67a58392a8e123c1
Adapt for changes in parent branch, and test churn.
17 files changed:
src/combine.cc
src/combine.h
test/combine_test.cc
test/ref/DCP/dcp_test1/ASSETMAP.xml
test/ref/DCP/dcp_test1/audio.mxf
test/ref/DCP/dcp_test1/cpl_81fb54df-e1bf-4647-8788-ea7ba154375b.xml
test/ref/DCP/dcp_test1/pkl_18be072e-5a0f-44e1-b2eb-c8a52ae12789.xml [deleted file]
test/ref/DCP/dcp_test1/pkl_cd49971e-bf4c-4594-8474-54ebef09a40c.xml [new file with mode: 0644]
test/ref/DCP/dcp_test7/ASSETMAP
test/ref/DCP/dcp_test7/audio.mxf
test/ref/DCP/dcp_test7/cpl_81fb54df-e1bf-4647-8788-ea7ba154375b.xml
test/ref/DCP/dcp_test7/pkl_18be072e-5a0f-44e1-b2eb-c8a52ae12789.xml [deleted file]
test/ref/DCP/dcp_test7/pkl_cd49971e-bf4c-4594-8474-54ebef09a40c.xml [new file with mode: 0644]
test/ref/cpl_metadata_test1.xml
test/ref/cpl_metadata_test2.xml
test/test.cc
test/verify_test.cc