Merge remote-tracking branch 'upstream/master'
authorjhurst <jhurst@cinecert.com>
Sun, 12 Sep 2021 20:55:51 +0000 (13:55 -0700)
committerjhurst <jhurst@cinecert.com>
Sun, 12 Sep 2021 20:55:51 +0000 (13:55 -0700)
commit8db9009293e6ace2ed05a8ca7bd734236a035c06
tree74a389e6cd8a034a30a5409cedc15cb4016a2eee
parent2cefda0dc78b4e8a1347dcd2ce281fcf6cfeef7a
parent24c1a213b74792f7ab4a9b3241c303403b558f55
Merge remote-tracking branch 'upstream/master'
src/AS_02_JXS.cpp
src/AS_02_JXS.h
src/MXF.cpp
src/as-02-wrap.cpp