diff options
| author | jhurst <jhurst@cinecert.com> | 2021-09-12 13:55:51 -0700 |
|---|---|---|
| committer | jhurst <jhurst@cinecert.com> | 2021-09-12 13:55:51 -0700 |
| commit | 8db9009293e6ace2ed05a8ca7bd734236a035c06 (patch) | |
| tree | 74a389e6cd8a034a30a5409cedc15cb4016a2eee /src/AS_02_JXS.h | |
| parent | 2cefda0dc78b4e8a1347dcd2ce281fcf6cfeef7a (diff) | |
| parent | 24c1a213b74792f7ab4a9b3241c303403b558f55 (diff) | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'src/AS_02_JXS.h')
| -rw-r--r-- | src/AS_02_JXS.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/AS_02_JXS.h b/src/AS_02_JXS.h index 6ef6aea..864110a 100644 --- a/src/AS_02_JXS.h +++ b/src/AS_02_JXS.h @@ -49,7 +49,7 @@ NOTE: ciphertext support for clip-wrapped PCM is not yet complete. #include "Metadata.h" #include "AS_02.h" -#include "AS_DCP_JXS.h" +#include "JXS.h" namespace AS_02 { @@ -77,8 +77,8 @@ namespace AS_02 // the operation cannot be completed or if nonsensical data is discovered // in the essence descriptor. Result_t OpenWrite(const std::string& filename, const ASDCP::WriterInfo&, - ASDCP::MXF::FileDescriptor* essence_descriptor, - ASDCP::MXF::InterchangeObject_list_t& essence_sub_descriptor_list, + ASDCP::MXF::GenericPictureEssenceDescriptor& picture_descriptor, + ASDCP::MXF::JPEGXSPictureSubDescriptor& jxs_sub_descriptor, const ASDCP::Rational& edit_rate, const ui32_t& header_size = 16384, const IndexStrategy_t& strategy = IS_FOLLOW, const ui32_t& partition_space = 10); |