Merge master; MXF subtitle stuff not included.
authorCarl Hetherington <cth@carlh.net>
Wed, 26 Feb 2014 18:41:41 +0000 (18:41 +0000)
committerCarl Hetherington <cth@carlh.net>
Wed, 26 Feb 2014 18:41:41 +0000 (18:41 +0000)
commit2e93ca3670e5581b5523f60130b38594de10d6c3
tree6ed18ed07bccf77b2d172ef7681fce981956815f
parent9ed550de7b98ca2f8467dd134a9c0ad7f1868f23
parent447cc7ddec5ace7bb47df35192ef02e7c19bf9b3
Merge master; MXF subtitle stuff not included.
20 files changed:
src/asset.cc
src/asset.h
src/content.h
src/cpl.cc
src/cpl.h
src/dcp.cc
src/mxf.cc
src/mxf.h
src/picture_mxf.h
src/signer_chain.cc
src/sound_mxf.h
src/subtitle_content.cc
src/subtitle_content.h
test/dcp_test.cc
test/decryption_test.cc
test/encryption_test.cc
test/rewrite_subs.cc
test/test.cc
test/test.h
wscript