Merge branch 'master' into htj2c htj2c 29/head
authorjhurst <jhurst@cinecert.com>
Mon, 10 Feb 2020 16:52:48 +0000 (08:52 -0800)
committerjhurst <jhurst@cinecert.com>
Mon, 10 Feb 2020 16:52:48 +0000 (08:52 -0800)
commit03ba76d3a337c6ae2fc35f3b96fa230d0c40ca44
treeb7ab5b9e6e4fbce16a130644f7d2c6dd9a78ac28
parentcdf50723fe234d97a34bd3152be5a4cdc6f4425e
parente187a605257a3ff9d8a84d23003a9f2bd13a12ac
Merge branch 'master' into htj2c

* master:
  Fix typo. I believe this actually references SMPTE RP 2057 "Text-Based Metadata Carriage in MXF" (implemented as part of commit f4061a21fffad4fdf8dbb2f193f0f0960b25421c).
  Fix Object ref not being written: this prevented GenericStreamTextBasedSet to be correctly linked to TextBasedDMFramework