Merge master.
authorCarl Hetherington <cth@carlh.net>
Tue, 18 Jun 2013 14:07:41 +0000 (15:07 +0100)
committerCarl Hetherington <cth@carlh.net>
Tue, 18 Jun 2013 14:07:41 +0000 (15:07 +0100)
commitc2bac22380bea453665a24c6f39200a977771daf
treea464d94724318b81484eb3011fa0a946205550c3
parent564f68cb2c258e61c1e70950c9d036859ea8619a
parent59617eb2230e47b59882c4f9ca6092ce05f53cf1
Merge master.
23 files changed:
examples/make_dcp.cc
run-tests.sh
src/asset.cc
src/asset.h
src/cpl.cc
src/cpl.h
src/dcp.cc
src/dcp.h
src/dcp_time.cc
src/mxf_asset.cc
src/mxf_asset.h
src/picture_asset.cc
src/picture_asset.h
src/reel.cc
src/reel.h
src/sound_asset.cc
src/sound_asset.h
src/subtitle_asset.cc
src/util.cc
src/util.h
src/wscript
test/tests.cc
wscript