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>
Sun, 20 Sep 2020 23:18:37 +0000 (01:18 +0200)
commit9ea9fc93d5c533732d6c003ba823c4baeabd871a
tree339432ef54f4b98ae89418d432d0a2dc03039a68
parent4e4cc8cdbe26f5c23800e13a7a1a22b51627ce9f
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