Merge branch 'master' into htj2c

diff --cc src/JP2K_Sequence_Parser.cpp
Simple merge

diff --cc src/KM_util.h
Simple merge

diff --cc src/MDD.cpp
index 71aefca1aa5cf0f0dedf9331e673d22a4b27edbe,a2c691fa3ea597451014ed1b4cae5319d74abf00..06d0fde760eea6a748bd18b8f78b81caa4868232
--- 1/src/MDD.cpp
--- 2/src/MDD.cpp
+++ b/src/MDD.cpp
@@@ -1608,26 -1608,10 +1608,28 @@@ static const ASDCP::MDDEntry s_MDD_Tabl
       {0}, false, "ACESFrameWrappedEssence" },
     { { 0x06, 0x0e, 0x2b, 0x34, 0x04, 0x01, 0x01, 0x0d, // 518
         0x03, 0x02, 0x01, 0x10, 0x00, 0x00, 0x00, 0x00 },
 -     {0}, false, "DCAudioChannel_FSKSyncSignalChannel" },   
 -   { { 0x06, 0x0e, 0x2b, 0x34, 0x04, 0x01, 0x01, 0x0d, // 519
 +     {0}, false, "DCAudioChannel_FSKSyncSignalChannel" },
 +   { { 0x06, 0x0e, 0x2b, 0x34, 0x01, 0x01, 0x01, 0x0e,
 +       0x04, 0x01, 0x06, 0x03, 0x0f, 0x00, 0x00, 0x00 },
 +     {0}, false, "JPEG2000PictureSubDescriptor_J2KExtendedCapabilities" }, // 519
 +   { { 0x06, 0x0e, 0x2b, 0x34, 0x01, 0x01, 0x01, 0x0e,
 +       0x04, 0x01, 0x06, 0x03, 0x10, 0x00, 0x00, 0x00 },
 +     {0}, false, "JPEG2000PictureSubDescriptor_J2KProfile" }, // 520
 +   { { 0x06, 0x0e, 0x2b, 0x34, 0x01, 0x01, 0x01, 0x0e,
 +       0x04, 0x01, 0x06, 0x03, 0x11, 0x00, 0x00, 0x00 },
 +     {0}, false, "JPEG2000PictureSubDescriptor_J2KCorrespondingProfile" }, // 521
 +   { { 0x06, 0x0e, 0x2b, 0x34, 0x01, 0x04, 0x01, 0x01,
 +       0x03, 0x01, 0x0d, 0x00, 0x00, 0x00, 0x00, 0x00 },
 +     {0}, false, "J2KExtendedCapabilities" }, // 522
 +   { { 0x06, 0x0e, 0x2b, 0x34, 0x04, 0x01, 0x01, 0x0D,
 +       0x04, 0x01, 0x02, 0x02, 0x03, 0x01, 0x08, 0x00 },
 +     {0}, false, "HTJ2KPictureCodingScheme" }, // 523
 +   { { 0x06, 0x0e, 0x2b, 0x34, 0x04, 0x01, 0x01, 0x0D,
 +       0x04, 0x01, 0x02, 0x02, 0x03, 0x01, 0x08, 0x01 },
 +     {0}, false, "HTJ2KPictureCodingSchemeGeneric" }, // 524
-    
++   { { 0x06, 0x0e, 0x2b, 0x34, 0x04, 0x01, 0x01, 0x0d, // 525
+        0x0d, 0x0f, 0x03, 0x02, 0x01, 0x01, 0x00, 0x00 },
+      {0}, false, "AudioChannelSLVS" },
     { {0}, {0}, false, 0 },
  
  };

diff --cc src/MDD.h
index 2de5af7adc9d6574ab215a56bc9b5797e5847dfe,6d7b702ab3c51d5f184339eed4dde2c2c2bc0da8..d704217945aa433abc9e998a495a39f1bd0c3024
--- 1/src/MDD.h
--- 2/src/MDD.h
+++ b/src/MDD.h
@@@ -554,12 -554,7 +554,13 @@@ namespace ASDCP 
        MDD_ACESUncompressedMonoscopicWithAlpha, // 516
        MDD_ACESFrameWrappedEssence, // 517
        MDD_DCAudioChannel_FSKSyncSignalChannel, // 518
 -      MDD_AudioChannelSLVS, // 519
 +      MDD_JPEG2000PictureSubDescriptor_J2KExtendedCapabilities, // 519
 +      MDD_JPEG2000PictureSubDescriptor_J2KProfile, // 520
 +      MDD_JPEG2000PictureSubDescriptor_J2KCorrespondingProfile, // 521
 +      MDD_J2KExtendedCapabilities, // 522
 +      MDD_HTJ2KPictureCodingScheme, // 523
 +      MDD_HTJ2KPictureCodingSchemeGeneric, // 524
++      MDD_AudioChannelSLVS, // 525
        MDD_Max
      }; // enum MDD_t
  

diff --cc src/Metadata.cpp
Simple merge

diff --cc src/Metadata.h
Simple merge