Fix rebase onto 1.0.
authorCarl Hetherington <cth@carlh.net>
Fri, 5 Jun 2015 13:42:28 +0000 (14:42 +0100)
committerCarl Hetherington <cth@carlh.net>
Fri, 5 Jun 2015 13:42:28 +0000 (14:42 +0100)
commit943e75e0ac5730714f3823771f127fe78e4cf82b
tree42e3668973fab1f76c9b0e616335e73cdf39f372
parentb06b12ad345ef9aadc2f53228cec1036e6174f29
Fix rebase onto 1.0.
src/reel_encryptable_asset.cc
src/reel_picture_asset.cc
src/reel_sound_asset.cc
test/ref/DCP/encryption_test/ASSETMAP.xml
test/ref/DCP/encryption_test/audio.mxf
test/ref/DCP/encryption_test/cpl_11c45f5d-d465-4c41-b008-5284cf38a037.xml [deleted file]
test/ref/DCP/encryption_test/cpl_cdecf5ab-b688-4842-bd60-0c9f5ce56e8c.xml [new file with mode: 0644]
test/ref/DCP/encryption_test/pkl_abf9d74a-c344-40a0-a929-21add8a3bd6e.xml [new file with mode: 0644]
test/ref/DCP/encryption_test/pkl_bf315122-2cd2-448c-8b1b-9f4c85a21629.xml [deleted file]
test/ref/DCP/encryption_test/video.mxf