projects / libdcp.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 318ed7e 86d0fa1)
Merge branch 'master' of ssh://git.carlh.net/home/carl/git/libdcp
authorCarl Hetherington <cth@carlh.net>
Fri, 15 Mar 2019 23:25:21 +0000 (23:25 +0000)
committerCarl Hetherington <cth@carlh.net>
Fri, 15 Mar 2019 23:25:21 +0000 (23:25 +0000)
1  2 
src/smpte_subtitle_asset.cc patch | diff1 | diff2 | blob | history

diff --cc src/smpte_subtitle_asset.cc
Simple merge
C++ library for handling digital cinema packages (DCPs).