MDD fix

2 files changed, 152 insertions, 170 deletions

diff --git a/src/MDD.cpp b/src/MDD.cpp
index 6ea726b..5a96592 100644
--- a/src/MDD.cpp
+++ b/src/MDD.cpp
@@ -1222,234 +1222,234 @@ static const ASDCP::MDDEntry s_MDD_Table[] = {
    { { 0x06, 0x0e, 0x2b, 0x34, 0x01, 0x01, 0x01, 0x0e, // 391
        0x03, 0x02, 0x01, 0x02, 0x21, 0x00, 0x00, 0x00 },
      {0}, false, "MCALabelSubDescriptor_MCAAudioElementKind" },
-   { { 0x06, 0x0e, 0x2b, 0x34, 0x04, 0x01, 0x01, 0x0d, // 396
+   { { 0x06, 0x0e, 0x2b, 0x34, 0x04, 0x01, 0x01, 0x0d, // 392
        0x0d, 0x01, 0x03, 0x01, 0x02, 0x0c, 0x03, 0x00 },
      {0}, false, "MXFGCI1FrameWrappedPictureElement" },
-   { { 0x06, 0x0e, 0x2b, 0x34, 0x04, 0x01, 0x01, 0x0d, // 397
+   { { 0x06, 0x0e, 0x2b, 0x34, 0x04, 0x01, 0x01, 0x0d, // 393
        0x0d, 0x01, 0x03, 0x01, 0x02, 0x0c, 0x06, 0x00 },
      {0}, false, "MXFGCP1FrameWrappedPictureElement" },
-   { { 0x06, 0x0e, 0x2b, 0x34, 0x04, 0x01, 0x01, 0x01, // 398
+   { { 0x06, 0x0e, 0x2b, 0x34, 0x04, 0x01, 0x01, 0x01, // 394
        0x04, 0x01, 0x01, 0x01, 0x01, 0x02, 0x00, 0x00 },
      {0}, false, "TransferCharacteristics_709" },
-   { { 0x06, 0x0e, 0x2b, 0x34, 0x04, 0x01, 0x01, 0x0e, // 399
+   { { 0x06, 0x0e, 0x2b, 0x34, 0x04, 0x01, 0x01, 0x0e, // 395
        0x04, 0x01, 0x01, 0x01, 0x01, 0x09, 0x00, 0x00 },
      {0}, false, "TransferCharacteristics_2020" },
-   { { 0x06, 0x0e, 0x2b, 0x34, 0x04, 0x01, 0x01, 0x0d, // 400
+   { { 0x06, 0x0e, 0x2b, 0x34, 0x04, 0x01, 0x01, 0x0d, // 396
        0x04, 0x01, 0x01, 0x01, 0x01, 0x08, 0x00, 0x00 },
      {0}, false, "TransferCharacteristics_xvYCC" },
-   { { 0x06, 0x0e, 0x2b, 0x34, 0x04, 0x01, 0x01, 0x0d, // 401
+   { { 0x06, 0x0e, 0x2b, 0x34, 0x04, 0x01, 0x01, 0x0d, // 397
        0x04, 0x01, 0x01, 0x01, 0x01, 0x0a, 0x00, 0x00 },
      {0}, false, "TransferCharacteristics_St2084" },
-   { { 0x06, 0x0e, 0x2b, 0x34, 0x04, 0x01, 0x01, 0x06, // 402
+   { { 0x06, 0x0e, 0x2b, 0x34, 0x04, 0x01, 0x01, 0x06, // 398
        0x04, 0x01, 0x01, 0x01, 0x01, 0x06, 0x00, 0x00 },
      {0}, false, "TransferCharacteristics_linear" },
-   { { 0x06, 0x0e, 0x2b, 0x34, 0x04, 0x01, 0x01, 0x01, // 403
+   { { 0x06, 0x0e, 0x2b, 0x34, 0x04, 0x01, 0x01, 0x01, // 399
        0x04, 0x01, 0x01, 0x01, 0x02, 0x01, 0x00, 0x00 },
      {0}, false, "CodingEquations_601" },
-   { { 0x06, 0x0e, 0x2b, 0x34, 0x04, 0x01, 0x01, 0x01, // 404
+   { { 0x06, 0x0e, 0x2b, 0x34, 0x04, 0x01, 0x01, 0x01, // 400
        0x04, 0x01, 0x01, 0x01, 0x02, 0x02, 0x00, 0x00 },
      {0}, false, "CodingEquations_709" },
-   { { 0x06, 0x0e, 0x2b, 0x34, 0x04, 0x01, 0x01, 0x0d, // 405
+   { { 0x06, 0x0e, 0x2b, 0x34, 0x04, 0x01, 0x01, 0x0d, // 401
        0x04, 0x01, 0x01, 0x01, 0x02, 0x06, 0x00, 0x00 },
      {0}, false, "CodingEquations_Rec2020" },
-   { { 0x06, 0x0e, 0x2b, 0x34, 0x04, 0x01, 0x01, 0x06, // 406
+   { { 0x06, 0x0e, 0x2b, 0x34, 0x04, 0x01, 0x01, 0x06, // 402
        0x04, 0x01, 0x01, 0x01, 0x03, 0x03, 0x00, 0x00 },
      {0}, false, "ColorPrimaries_BT709" },
-   { { 0x06, 0x0e, 0x2b, 0x34, 0x04, 0x01, 0x01, 0x0D, // 407
+   { { 0x06, 0x0e, 0x2b, 0x34, 0x04, 0x01, 0x01, 0x0D, // 403
        0x04, 0x01, 0x01, 0x01, 0x03, 0x04, 0x00, 0x00 },
      {0}, false, "ColorPrimaries_BT2020" },
-   { { 0x06, 0x0e, 0x2b, 0x34, 0x04, 0x01, 0x01, 0x0d, // 408
+   { { 0x06, 0x0e, 0x2b, 0x34, 0x04, 0x01, 0x01, 0x0d, // 404
        0x04, 0x01, 0x01, 0x01, 0x03, 0x06, 0x00, 0x00 },
      {0}, false, "ColorPrimaries_P3D65" },
-   { { 0x06, 0x0e, 0x2b, 0x34, 0x04, 0x01, 0x01, 0x0e, // 409
+   { { 0x06, 0x0e, 0x2b, 0x34, 0x04, 0x01, 0x01, 0x0e, // 405
        0x04, 0x01, 0x01, 0x01, 0x03, 0x07, 0x00, 0x00 },
      {0}, false, "ColorPrimaries_XYZ" },
-   { { 0x06, 0x0e, 0x2b, 0x34, 0x01, 0x01, 0x01, 0x0e, // 410
+   { { 0x06, 0x0e, 0x2b, 0x34, 0x01, 0x01, 0x01, 0x0e, // 406
        0x04, 0x20, 0x04, 0x01, 0x01, 0x01, 0x00, 0x00 },
      {0}, false, "GenericPictureEssenceDescriptor_MasteringDisplayPrimaries" },
-   { { 0x06, 0x0e, 0x2b, 0x34, 0x01, 0x01, 0x01, 0x0e, // 411
+   { { 0x06, 0x0e, 0x2b, 0x34, 0x01, 0x01, 0x01, 0x0e, // 407
        0x04, 0x20, 0x04, 0x01, 0x01, 0x02, 0x00, 0x00 },
      {0}, false, "GenericPictureEssenceDescriptor_MasteringDisplayWhitePointChromaticity" },
-   { { 0x06, 0x0e, 0x2b, 0x34, 0x01, 0x01, 0x01, 0x0e, // 412
+   { { 0x06, 0x0e, 0x2b, 0x34, 0x01, 0x01, 0x01, 0x0e, // 408
        0x04, 0x20, 0x04, 0x01, 0x01, 0x03, 0x00, 0x00 },
      {0}, false, "GenericPictureEssenceDescriptor_MasteringDisplayMaximumLuminance" },
-   { { 0x06, 0x0e, 0x2b, 0x34, 0x01, 0x01, 0x01, 0x0e, // 413
+   { { 0x06, 0x0e, 0x2b, 0x34, 0x01, 0x01, 0x01, 0x0e, // 409
        0x04, 0x20, 0x04, 0x01, 0x01, 0x04, 0x00, 0x00 },
      {0}, false, "GenericPictureEssenceDescriptor_MasteringDisplayMinimumLuminance" },
-   { { 0x06, 0x0e, 0x2b, 0x34, 0x04, 0x01, 0x01, 0x0d, // 414
+   { { 0x06, 0x0e, 0x2b, 0x34, 0x04, 0x01, 0x01, 0x0d, // 410
        0x04, 0x01, 0x02, 0x02, 0x03, 0x01, 0x02, 0x00 },
      {0}, false, "JP2KEssenceCompression_IMFProfile_2K_Lossy" },
-   { { 0x06, 0x0e, 0x2b, 0x34, 0x04, 0x01, 0x01, 0x0d, // 415
+   { { 0x06, 0x0e, 0x2b, 0x34, 0x04, 0x01, 0x01, 0x0d, // 411
        0x04, 0x01, 0x02, 0x02, 0x03, 0x01, 0x03, 0x00 },
      {0}, false, "JP2KEssenceCompression_IMFProfile_4K_Lossy" },
-   { { 0x06, 0x0e, 0x2b, 0x34, 0x04, 0x01, 0x01, 0x0d, // 416
+   { { 0x06, 0x0e, 0x2b, 0x34, 0x04, 0x01, 0x01, 0x0d, // 412
        0x04, 0x01, 0x02, 0x02, 0x03, 0x01, 0x04, 0x00 },
      {0}, false, "JP2KEssenceCompression_IMFProfile_8K_Lossy" },
-   { { 0x06, 0x0e, 0x2b, 0x34, 0x04, 0x01, 0x01, 0x0d, // 417
+   { { 0x06, 0x0e, 0x2b, 0x34, 0x04, 0x01, 0x01, 0x0d, // 413
        0x04, 0x01, 0x02, 0x02, 0x03, 0x01, 0x05, 0x00 },
      {0}, false, "JP2KEssenceCompression_IMFProfile_2K_Reversible" },
-   { { 0x06, 0x0e, 0x2b, 0x34, 0x04, 0x01, 0x01, 0x0d, // 418
+   { { 0x06, 0x0e, 0x2b, 0x34, 0x04, 0x01, 0x01, 0x0d, // 414
        0x04, 0x01, 0x02, 0x02, 0x03, 0x01, 0x06, 0x00 },
      {0}, false, "JP2KEssenceCompression_IMFProfile_4K_Reversible" },
-   { { 0x06, 0x0e, 0x2b, 0x34, 0x04, 0x01, 0x01, 0x0d, // 419
+   { { 0x06, 0x0e, 0x2b, 0x34, 0x04, 0x01, 0x01, 0x0d, // 415
        0x04, 0x01, 0x02, 0x02, 0x03, 0x01, 0x07, 0x00 },
      {0}, false, "JP2KEssenceCompression_IMFProfile_8K_Reversible" },
-   { { 0x06, 0x0e, 0x2b, 0x34, 0x04, 0x01, 0x01, 0x0d,  // 420
+   { { 0x06, 0x0e, 0x2b, 0x34, 0x04, 0x01, 0x01, 0x0d,  // 416
        0x04, 0x01, 0x02, 0x02, 0x03, 0x01, 0x03, 0x03 },
      {0}, false, "JP2KEssenceCompression_IMFProfile_4K_Lossy_1_1" },
-   { { 0x06, 0x0e, 0x2b, 0x34, 0x04, 0x01, 0x01, 0x0d,  // 421
+   { { 0x06, 0x0e, 0x2b, 0x34, 0x04, 0x01, 0x01, 0x0d,  // 417
        0x04, 0x01, 0x02, 0x02, 0x03, 0x01, 0x03, 0x05 },
      {0}, false, "JP2KEssenceCompression_IMFProfile_4K_Lossy_2_1" },
-   { { 0x06, 0x0e, 0x2b, 0x34, 0x04, 0x01, 0x01, 0x0d,  // 422
+   { { 0x06, 0x0e, 0x2b, 0x34, 0x04, 0x01, 0x01, 0x0d,  // 418
        0x04, 0x01, 0x02, 0x02, 0x03, 0x01, 0x03, 0x07 },
      {0}, false, "JP2KEssenceCompression_IMFProfile_4K_Lossy_3_1" },
-   { { 0x06, 0x0e, 0x2b, 0x34, 0x04, 0x01, 0x01, 0x0d,  // 423
+   { { 0x06, 0x0e, 0x2b, 0x34, 0x04, 0x01, 0x01, 0x0d,  // 419
        0x04, 0x01, 0x02, 0x02, 0x03, 0x01, 0x03, 0x09 },
      {0}, false, "JP2KEssenceCompression_IMFProfile_4K_Lossy_4_1" },
-   { { 0x06, 0x0e, 0x2b, 0x34, 0x04, 0x01, 0x01, 0x0d,  // 424
+   { { 0x06, 0x0e, 0x2b, 0x34, 0x04, 0x01, 0x01, 0x0d,  // 420
        0x04, 0x01, 0x02, 0x02, 0x03, 0x01, 0x03, 0x0a },
      {0}, false, "JP2KEssenceCompression_IMFProfile_4K_Lossy_4_2" },
-   { { 0x06, 0x0e, 0x2b, 0x34, 0x04, 0x01, 0x01, 0x0d,  // 425
+   { { 0x06, 0x0e, 0x2b, 0x34, 0x04, 0x01, 0x01, 0x0d,  // 421
        0x04, 0x01, 0x02, 0x02, 0x03, 0x01, 0x03, 0x0c },
      {0}, false, "JP2KEssenceCompression_IMFProfile_4K_Lossy_5_1" },
-   { { 0x06, 0x0e, 0x2b, 0x34, 0x04, 0x01, 0x01, 0x0d,  // 426
+   { { 0x06, 0x0e, 0x2b, 0x34, 0x04, 0x01, 0x01, 0x0d,  // 422
        0x04, 0x01, 0x02, 0x02, 0x03, 0x01, 0x03, 0x0d },
      {0}, false, "JP2KEssenceCompression_IMFProfile_4K_Lossy_5_2" },
-   { { 0x06, 0x0e, 0x2b, 0x34, 0x04, 0x01, 0x01, 0x0d,  // 427
+   { { 0x06, 0x0e, 0x2b, 0x34, 0x04, 0x01, 0x01, 0x0d,  // 423
        0x04, 0x01, 0x02, 0x02, 0x03, 0x01, 0x03, 0x0e },
      {0}, false, "JP2KEssenceCompression_IMFProfile_4K_Lossy_5_3" },
-   { { 0x06, 0x0e, 0x2b, 0x34, 0x04, 0x01, 0x01, 0x0d,  // 428
+   { { 0x06, 0x0e, 0x2b, 0x34, 0x04, 0x01, 0x01, 0x0d,  // 424
        0x04, 0x01, 0x02, 0x02, 0x03, 0x01, 0x03, 0x10 },
      {0}, false, "JP2KEssenceCompression_IMFProfile_4K_Lossy_6_1" },
-   { { 0x06, 0x0e, 0x2b, 0x34, 0x04, 0x01, 0x01, 0x0d,  // 429
+   { { 0x06, 0x0e, 0x2b, 0x34, 0x04, 0x01, 0x01, 0x0d,  // 425
        0x04, 0x01, 0x02, 0x02, 0x03, 0x01, 0x03, 0x11 },
      {0}, false, "JP2KEssenceCompression_IMFProfile_4K_Lossy_6_2" },
-   { { 0x06, 0x0e, 0x2b, 0x34, 0x04, 0x01, 0x01, 0x0d,  // 430
+   { { 0x06, 0x0e, 0x2b, 0x34, 0x04, 0x01, 0x01, 0x0d,  // 426
        0x04, 0x01, 0x02, 0x02, 0x03, 0x01, 0x03, 0x12 },
      {0}, false, "JP2KEssenceCompression_IMFProfile_4K_Lossy_6_3" },
-   { { 0x06, 0x0e, 0x2b, 0x34, 0x04, 0x01, 0x01, 0x0d,  // 431
+   { { 0x06, 0x0e, 0x2b, 0x34, 0x04, 0x01, 0x01, 0x0d,  // 427
        0x04, 0x01, 0x02, 0x02, 0x03, 0x01, 0x03, 0x13 },
      {0}, false, "JP2KEssenceCompression_IMFProfile_4K_Lossy_6_4" },
-   { { 0x06, 0x0e, 0x2b, 0x34, 0x04, 0x01, 0x01, 0x0d,  // 432
+   { { 0x06, 0x0e, 0x2b, 0x34, 0x04, 0x01, 0x01, 0x0d,  // 428
        0x04, 0x01, 0x02, 0x02, 0x03, 0x01, 0x03, 0x15 },
      {0}, false, "JP2KEssenceCompression_IMFProfile_4K_Lossy_7_1" },
-   { { 0x06, 0x0e, 0x2b, 0x34, 0x04, 0x01, 0x01, 0x0d,  // 433
+   { { 0x06, 0x0e, 0x2b, 0x34, 0x04, 0x01, 0x01, 0x0d,  // 429
        0x04, 0x01, 0x02, 0x02, 0x03, 0x01, 0x03, 0x16 },
      {0}, false, "JP2KEssenceCompression_IMFProfile_4K_Lossy_7_2" },
-   { { 0x06, 0x0e, 0x2b, 0x34, 0x04, 0x01, 0x01, 0x0d,  // 434
+   { { 0x06, 0x0e, 0x2b, 0x34, 0x04, 0x01, 0x01, 0x0d,  // 430
        0x04, 0x01, 0x02, 0x02, 0x03, 0x01, 0x03, 0x17 },
      {0}, false, "JP2KEssenceCompression_IMFProfile_4K_Lossy_7_3" },
-   { { 0x06, 0x0e, 0x2b, 0x34, 0x04, 0x01, 0x01, 0x0d,  // 435
+   { { 0x06, 0x0e, 0x2b, 0x34, 0x04, 0x01, 0x01, 0x0d,  // 431
        0x04, 0x01, 0x02, 0x02, 0x03, 0x01, 0x03, 0x18 },
      {0}, false, "JP2KEssenceCompression_IMFProfile_4K_Lossy_7_4" },
-   { { 0x06, 0x0e, 0x2b, 0x34, 0x04, 0x01, 0x01, 0x0d,  // 436
+   { { 0x06, 0x0e, 0x2b, 0x34, 0x04, 0x01, 0x01, 0x0d,  // 432
        0x04, 0x01, 0x02, 0x02, 0x03, 0x01, 0x03, 0x19 },
      {0}, false, "JP2KEssenceCompression_IMFProfile_4K_Lossy_7_5" },
-   { { 0x06, 0x0e, 0x2b, 0x34, 0x04, 0x01, 0x01, 0x0d,  // 437
+   { { 0x06, 0x0e, 0x2b, 0x34, 0x04, 0x01, 0x01, 0x0d,  // 433
        0x04, 0x01, 0x02, 0x02, 0x03, 0x01, 0x03, 0x1b },
      {0}, false, "JP2KEssenceCompression_IMFProfile_4K_Lossy_8_1" },
-   { { 0x06, 0x0e, 0x2b, 0x34, 0x04, 0x01, 0x01, 0x0d,  // 438
+   { { 0x06, 0x0e, 0x2b, 0x34, 0x04, 0x01, 0x01, 0x0d,  // 434
        0x04, 0x01, 0x02, 0x02, 0x03, 0x01, 0x03, 0x1c },
      {0}, false, "JP2KEssenceCompression_IMFProfile_4K_Lossy_8_2" },
-   { { 0x06, 0x0e, 0x2b, 0x34, 0x04, 0x01, 0x01, 0x0d,  // 439
+   { { 0x06, 0x0e, 0x2b, 0x34, 0x04, 0x01, 0x01, 0x0d,  // 435
        0x04, 0x01, 0x02, 0x02, 0x03, 0x01, 0x03, 0x1d },
      {0}, false, "JP2KEssenceCompression_IMFProfile_4K_Lossy_8_3" },
-   { { 0x06, 0x0e, 0x2b, 0x34, 0x04, 0x01, 0x01, 0x0d,  // 440
+   { { 0x06, 0x0e, 0x2b, 0x34, 0x04, 0x01, 0x01, 0x0d,  // 436
        0x04, 0x01, 0x02, 0x02, 0x03, 0x01, 0x03, 0x1e },
      {0}, false, "JP2KEssenceCompression_IMFProfile_4K_Lossy_8_4" },
-   { { 0x06, 0x0e, 0x2b, 0x34, 0x04, 0x01, 0x01, 0x0d,  // 441
+   { { 0x06, 0x0e, 0x2b, 0x34, 0x04, 0x01, 0x01, 0x0d,  // 437
        0x04, 0x01, 0x02, 0x02, 0x03, 0x01, 0x03, 0x1f },
      {0}, false, "JP2KEssenceCompression_IMFProfile_4K_Lossy_8_5" },
-   { { 0x06, 0x0e, 0x2b, 0x34, 0x04, 0x01, 0x01, 0x0d,  // 442
+   { { 0x06, 0x0e, 0x2b, 0x34, 0x04, 0x01, 0x01, 0x0d,  // 438
        0x04, 0x01, 0x02, 0x02, 0x03, 0x01, 0x03, 0x20 },
      {0}, false, "JP2KEssenceCompression_IMFProfile_4K_Lossy_8_6" },
-   { { 0x06, 0x0e, 0x2b, 0x34, 0x04, 0x01, 0x01, 0x0d,  // 443
+   { { 0x06, 0x0e, 0x2b, 0x34, 0x04, 0x01, 0x01, 0x0d,  // 439
        0x04, 0x01, 0x02, 0x02, 0x03, 0x01, 0x05, 0x02 },
      {0}, false, "JP2KEssenceCompression_IMFProfile_2K_Reversible_1_0" },
-   { { 0x06, 0x0e, 0x2b, 0x34, 0x04, 0x01, 0x01, 0x0d,  // 444
+   { { 0x06, 0x0e, 0x2b, 0x34, 0x04, 0x01, 0x01, 0x0d,  // 440
        0x04, 0x01, 0x02, 0x02, 0x03, 0x01, 0x05, 0x04 },
      {0}, false, "JP2KEssenceCompression_IMFProfile_2K_Reversible_2_0" },
-   { { 0x06, 0x0e, 0x2b, 0x34, 0x04, 0x01, 0x01, 0x0d,  // 445
+   { { 0x06, 0x0e, 0x2b, 0x34, 0x04, 0x01, 0x01, 0x0d,  // 441
        0x04, 0x01, 0x02, 0x02, 0x03, 0x01, 0x05, 0x06 },
      {0}, false, "JP2KEssenceCompression_IMFProfile_2K_Reversible_3_0" },
-   { { 0x06, 0x0e, 0x2b, 0x34, 0x04, 0x01, 0x01, 0x0d,  // 446
+   { { 0x06, 0x0e, 0x2b, 0x34, 0x04, 0x01, 0x01, 0x0d,  // 442
        0x04, 0x01, 0x02, 0x02, 0x03, 0x01, 0x05, 0x08 },
      {0}, false, "JP2KEssenceCompression_IMFProfile_2K_Reversible_4_0" },
-   { { 0x06, 0x0e, 0x2b, 0x34, 0x04, 0x01, 0x01, 0x0d,  // 447
+   { { 0x06, 0x0e, 0x2b, 0x34, 0x04, 0x01, 0x01, 0x0d,  // 443
        0x04, 0x01, 0x02, 0x02, 0x03, 0x01, 0x05, 0x0b },
      {0}, false, "JP2KEssenceCompression_IMFProfile_2K_Reversible_5_0" },
-   { { 0x06, 0x0e, 0x2b, 0x34, 0x04, 0x01, 0x01, 0x0d,  // 448
+   { { 0x06, 0x0e, 0x2b, 0x34, 0x04, 0x01, 0x01, 0x0d,  // 444
        0x04, 0x01, 0x02, 0x02, 0x03, 0x01, 0x05, 0x0f },
      {0}, false, "JP2KEssenceCompression_IMFProfile_2K_Reversible_6_0" },
-   { { 0x06, 0x0e, 0x2b, 0x34, 0x04, 0x01, 0x01, 0x0d,  // 449
+   { { 0x06, 0x0e, 0x2b, 0x34, 0x04, 0x01, 0x01, 0x0d,  // 445
        0x04, 0x01, 0x02, 0x02, 0x03, 0x01, 0x06, 0x02 },
      {0}, false, "JP2KEssenceCompression_IMFProfile_4K_Reversible_1_0" },
-   { { 0x06, 0x0e, 0x2b, 0x34, 0x04, 0x01, 0x01, 0x0d,  // 450
+   { { 0x06, 0x0e, 0x2b, 0x34, 0x04, 0x01, 0x01, 0x0d,  // 446
        0x04, 0x01, 0x02, 0x02, 0x03, 0x01, 0x06, 0x04 },
      {0}, false, "JP2KEssenceCompression_IMFProfile_4K_Reversible_2_0" },
-   { { 0x06, 0x0e, 0x2b, 0x34, 0x04, 0x01, 0x01, 0x0d,  // 451
+   { { 0x06, 0x0e, 0x2b, 0x34, 0x04, 0x01, 0x01, 0x0d,  // 447
        0x04, 0x01, 0x02, 0x02, 0x03, 0x01, 0x06, 0x06 },
      {0}, false, "JP2KEssenceCompression_IMFProfile_4K_Reversible_3_0" },
-   { { 0x06, 0x0e, 0x2b, 0x34, 0x04, 0x01, 0x01, 0x0d,  // 452
+   { { 0x06, 0x0e, 0x2b, 0x34, 0x04, 0x01, 0x01, 0x0d,  // 448
        0x04, 0x01, 0x02, 0x02, 0x03, 0x01, 0x06, 0x08 },
      {0}, false, "JP2KEssenceCompression_IMFProfile_4K_Reversible_4_0" },
-   { { 0x06, 0x0e, 0x2b, 0x34, 0x04, 0x01, 0x01, 0x0d,  // 453
+   { { 0x06, 0x0e, 0x2b, 0x34, 0x04, 0x01, 0x01, 0x0d,  // 449
        0x04, 0x01, 0x02, 0x02, 0x03, 0x01, 0x06, 0x0b },
      {0}, false, "JP2KEssenceCompression_IMFProfile_4K_Reversible_5_0" },
-   { { 0x06, 0x0e, 0x2b, 0x34, 0x04, 0x01, 0x01, 0x0d,  // 454
+   { { 0x06, 0x0e, 0x2b, 0x34, 0x04, 0x01, 0x01, 0x0d,  // 450
        0x04, 0x01, 0x02, 0x02, 0x03, 0x01, 0x06, 0x0f },
      {0}, false, "JP2KEssenceCompression_IMFProfile_4K_Reversible_6_0" },
-   { { 0x06, 0x0e, 0x2b, 0x34, 0x04, 0x01, 0x01, 0x0d,  // 455
+   { { 0x06, 0x0e, 0x2b, 0x34, 0x04, 0x01, 0x01, 0x0d,  // 451
        0x04, 0x01, 0x02, 0x02, 0x03, 0x01, 0x06, 0x14 },
      {0}, false, "JP2KEssenceCompression_IMFProfile_4K_Reversible_7_0" },
-   { { 0x06, 0x0e, 0x2b, 0x34, 0x04, 0x01, 0x01, 0x0d,  // 456
+   { { 0x06, 0x0e, 0x2b, 0x34, 0x04, 0x01, 0x01, 0x0d,  // 452
        0x04, 0x01, 0x02, 0x02, 0x03, 0x01, 0x06, 0x1a },
      {0}, false, "JP2KEssenceCompression_IMFProfile_4K_Reversible_8_0" },
-   { { 0x06, 0x0e, 0x2b, 0x34, 0x04, 0x01, 0x01, 0x0d,  // 457
+   { { 0x06, 0x0e, 0x2b, 0x34, 0x04, 0x01, 0x01, 0x0d,  // 453
        0x04, 0x01, 0x02, 0x02, 0x03, 0x01, 0x07, 0x02 },
      {0}, false, "JP2KEssenceCompression_IMFProfile_8K_Reversible_1_0" },
-   { { 0x06, 0x0e, 0x2b, 0x34, 0x04, 0x01, 0x01, 0x0d,  // 458
+   { { 0x06, 0x0e, 0x2b, 0x34, 0x04, 0x01, 0x01, 0x0d,  // 454
        0x04, 0x01, 0x02, 0x02, 0x03, 0x01, 0x07, 0x04 },
      {0}, false, "JP2KEssenceCompression_IMFProfile_8K_Reversible_2_0" },
-   { { 0x06, 0x0e, 0x2b, 0x34, 0x04, 0x01, 0x01, 0x0d,  // 459
+   { { 0x06, 0x0e, 0x2b, 0x34, 0x04, 0x01, 0x01, 0x0d,  // 455
        0x04, 0x01, 0x02, 0x02, 0x03, 0x01, 0x07, 0x06 },
      {0}, false, "JP2KEssenceCompression_IMFProfile_8K_Reversible_3_0" },
-   { { 0x06, 0x0e, 0x2b, 0x34, 0x04, 0x01, 0x01, 0x0d,  // 460
+   { { 0x06, 0x0e, 0x2b, 0x34, 0x04, 0x01, 0x01, 0x0d,  // 456
        0x04, 0x01, 0x02, 0x02, 0x03, 0x01, 0x07, 0x08 },
      {0}, false, "JP2KEssenceCompression_IMFProfile_8K_Reversible_4_0" },
-   { { 0x06, 0x0e, 0x2b, 0x34, 0x04, 0x01, 0x01, 0x0d,  // 461
+   { { 0x06, 0x0e, 0x2b, 0x34, 0x04, 0x01, 0x01, 0x0d,  // 457
        0x04, 0x01, 0x02, 0x02, 0x03, 0x01, 0x07, 0x0b },
      {0}, false, "JP2KEssenceCompression_IMFProfile_8K_Reversible_5_0" },
-   { { 0x06, 0x0e, 0x2b, 0x34, 0x04, 0x01, 0x01, 0x0d,  // 462
+   { { 0x06, 0x0e, 0x2b, 0x34, 0x04, 0x01, 0x01, 0x0d,  // 458
        0x04, 0x01, 0x02, 0x02, 0x03, 0x01, 0x07, 0x0f },
      {0}, false, "JP2KEssenceCompression_IMFProfile_8K_Reversible_6_0" },
-   { { 0x06, 0x0e, 0x2b, 0x34, 0x04, 0x01, 0x01, 0x0d,  // 463
+   { { 0x06, 0x0e, 0x2b, 0x34, 0x04, 0x01, 0x01, 0x0d,  // 459
        0x04, 0x01, 0x02, 0x02, 0x03, 0x01, 0x07, 0x14 },
      {0}, false, "JP2KEssenceCompression_IMFProfile_8K_Reversible_7_0" },
-   { { 0x06, 0x0e, 0x2b, 0x34, 0x04, 0x01, 0x01, 0x0d,  // 464
+   { { 0x06, 0x0e, 0x2b, 0x34, 0x04, 0x01, 0x01, 0x0d,  // 460
        0x04, 0x01, 0x02, 0x02, 0x03, 0x01, 0x07, 0x1a },
      {0}, false, "JP2KEssenceCompression_IMFProfile_8K_Reversible_8_0" },
-   { { 0x06, 0x0e, 0x2b, 0x34, 0x04, 0x01, 0x01, 0x0d,  // 465
+   { { 0x06, 0x0e, 0x2b, 0x34, 0x04, 0x01, 0x01, 0x0d,  // 461
        0x04, 0x01, 0x02, 0x02, 0x03, 0x01, 0x07, 0x21 },
      {0}, false, "JP2KEssenceCompression_IMFProfile_8K_Reversible_9_0" },
-   { { 0x06, 0x0e, 0x2b, 0x34, 0x04, 0x01, 0x01, 0x0d,  // 466
+   { { 0x06, 0x0e, 0x2b, 0x34, 0x04, 0x01, 0x01, 0x0d,  // 462
        0x04, 0x01, 0x02, 0x02, 0x03, 0x01, 0x07, 0x29 },
      {0}, false, "JP2KEssenceCompression_IMFProfile_8K_Reversible_10_0" },
-   { { 0x06, 0x0e, 0x2b, 0x34, 0x04, 0x01, 0x01, 0x0a,  // 467
+   { { 0x06, 0x0e, 0x2b, 0x34, 0x04, 0x01, 0x01, 0x0a,  // 463
        0x04, 0x02, 0x02, 0x01, 0x01, 0x00, 0x00, 0x00 },
      {0}, false, "SMPTE382MDefaultUncompressedSoundCoding" },
 
    // protype for generic aux data (IMF)
-   { { 0x06, 0x0e, 0x2b, 0x34, 0x04, 0x01, 0x01, 0x05, // 468
+   { { 0x06, 0x0e, 0x2b, 0x34, 0x04, 0x01, 0x01, 0x05, // 464
        0x0e, 0x09, 0x06, 0x07, 0x01, 0x01, 0x10, 0x00 },
      {0}, false, "PIMFDynamicMetadataWrappingFrame" },
-   { { 0x06, 0x0e, 0x2b, 0x34, 0x01, 0x02, 0x01, 0x05, // 469
+   { { 0x06, 0x0e, 0x2b, 0x34, 0x01, 0x02, 0x01, 0x05, // 465
        0x0e, 0x09, 0x06, 0x07, 0x01, 0x01, 0x11, 0x00 },
      {0}, false, "PIMFDynamicMetadataEssence" },
-   { { 0x06, 0x0e, 0x2b, 0x34, 0x02, 0x53, 0x01, 0x05, // 470
+   { { 0x06, 0x0e, 0x2b, 0x34, 0x02, 0x53, 0x01, 0x05, // 466
        0x0e, 0x09, 0x06, 0x07, 0x01, 0x01, 0x12, 0x00 },
      {0}, false, "PIMFDynamicMetadataDescriptor" },
-   { { 0x06, 0x0e, 0x2b, 0x34, 0x01, 0x01, 0x01, 0x05, // 471
+   { { 0x06, 0x0e, 0x2b, 0x34, 0x01, 0x01, 0x01, 0x05, // 467
        0x0e, 0x09, 0x06, 0x07, 0x01, 0x01, 0x13, 0x00 },
      {0}, false, "PIMFDynamicMetadataDescriptor_GlobalPayloadSID" },
 
diff --git a/src/MDD.h b/src/MDD.h
index 0e8fb24..2f5f4f0 100755
--- a/src/MDD.h
+++ b/src/MDD.h
@@ -427,101 +427,83 @@ namespace ASDCP {
 	MDD_MCALabelSubDescriptor_MCAPartitionNumber, // 389
 	MDD_MCALabelSubDescriptor_MCAAudioContentKind, // 390
 	MDD_MCALabelSubDescriptor_MCAAudioElementKind, // 391
-	MDD_PIMFDynamicMetadataWrappingFrame, // 392
-	MDD_PIMFDynamicMetadataEssence, // 393
-	MDD_PIMFDynamicMetadataDescriptor, // 394
-	MDD_PIMFDynamicMetadataDescriptor_GlobalPayloadSID, // 395
-
-	//
-	MDD_MXFGCI1FrameWrappedPictureElement, // 396
-	MDD_MXFGCP1FrameWrappedPictureElement, // 397
-		
-		
-		MDD_TransferCharacteristics_709,
-		MDD_TransferCharacteristics_2020,  //
-		MDD_TransferCharacteristics_xvYCC,
-		MDD_TransferCharacteristics_St2084,	
-		MDD_TransferCharacteristics_linear,
-
-	
-		MDD_CodingEquations_601,  //
-		MDD_CodingEquations_709,
-		MDD_CodingEquations_Rec2020,
+	MDD_MXFGCI1FrameWrappedPictureElement, // 392
+	MDD_MXFGCP1FrameWrappedPictureElement, // 393
+	MDD_TransferCharacteristics_709, // 394
+	MDD_TransferCharacteristics_2020,  // 395
+	MDD_TransferCharacteristics_xvYCC, // 396
+	MDD_TransferCharacteristics_St2084, // 397
+	MDD_TransferCharacteristics_linear, // 398
+	MDD_CodingEquations_601, // 399
+	MDD_CodingEquations_709, // 400
+	MDD_CodingEquations_Rec2020, // 401
+	MDD_ColorPrimaries_BT709, // 402
+	MDD_ColorPrimaries_BT2020, // 403
+	MDD_ColorPrimaries_P3D65, // 404
+	MDD_ColorPrimaries_XYZ, // 405
+	MDD_GenericPictureEssenceDescriptor_MasteringDisplayPrimaries, // 406
+	MDD_GenericPictureEssenceDescriptor_MasteringDisplayWhitePointChromaticity, // 407
+	MDD_GenericPictureEssenceDescriptor_MasteringDisplayMaximumLuminance, // 408
+	MDD_GenericPictureEssenceDescriptor_MasteringDisplayMinimumLuminance, // 409
+	MDD_JP2KEssenceCompression_IMFProfile_2K_Lossy, // 410
+	MDD_JP2KEssenceCompression_IMFProfile_4K_Lossy, // 411
+	MDD_JP2KEssenceCompression_IMFProfile_8K_Lossy, // 412
+	MDD_JP2KEssenceCompression_IMFProfile_2K_Reversible, // 413
+	MDD_JP2KEssenceCompression_IMFProfile_4K_Reversible, // 414
+	MDD_JP2KEssenceCompression_IMFProfile_8K_Reversible, // 415
+	MDD_JP2KEssenceCompression_IMFProfile_4K_Lossy_1_1, // 416
+	MDD_JP2KEssenceCompression_IMFProfile_4K_Lossy_2_1, // 417
+	MDD_JP2KEssenceCompression_IMFProfile_4K_Lossy_3_1, // 418
+	MDD_JP2KEssenceCompression_IMFProfile_4K_Lossy_4_1, // 419
+	MDD_JP2KEssenceCompression_IMFProfile_4K_Lossy_4_2, // 420
+	MDD_JP2KEssenceCompression_IMFProfile_4K_Lossy_5_1, // 421
+	MDD_JP2KEssenceCompression_IMFProfile_4K_Lossy_5_2, // 422
+	MDD_JP2KEssenceCompression_IMFProfile_4K_Lossy_5_3, // 423
+	MDD_JP2KEssenceCompression_IMFProfile_4K_Lossy_6_1, // 424
+	MDD_JP2KEssenceCompression_IMFProfile_4K_Lossy_6_2, // 425
+	MDD_JP2KEssenceCompression_IMFProfile_4K_Lossy_6_3, // 426
+	MDD_JP2KEssenceCompression_IMFProfile_4K_Lossy_6_4, // 427
+	MDD_JP2KEssenceCompression_IMFProfile_4K_Lossy_7_1, // 428
+	MDD_JP2KEssenceCompression_IMFProfile_4K_Lossy_7_2, // 429
+	MDD_JP2KEssenceCompression_IMFProfile_4K_Lossy_7_3, // 430
+	MDD_JP2KEssenceCompression_IMFProfile_4K_Lossy_7_4, // 431
+	MDD_JP2KEssenceCompression_IMFProfile_4K_Lossy_7_5, // 432
+	MDD_JP2KEssenceCompression_IMFProfile_4K_Lossy_8_1, // 433
+	MDD_JP2KEssenceCompression_IMFProfile_4K_Lossy_8_2, // 434
+	MDD_JP2KEssenceCompression_IMFProfile_4K_Lossy_8_3, // 435
+	MDD_JP2KEssenceCompression_IMFProfile_4K_Lossy_8_4, // 436
+	MDD_JP2KEssenceCompression_IMFProfile_4K_Lossy_8_5, // 437
+	MDD_JP2KEssenceCompression_IMFProfile_4K_Lossy_8_6, // 438
+	MDD_JP2KEssenceCompression_IMFProfile_2K_Reversible_1_0, // 439
+	MDD_JP2KEssenceCompression_IMFProfile_2K_Reversible_2_0, // 440
+	MDD_JP2KEssenceCompression_IMFProfile_2K_Reversible_3_0, // 441
+	MDD_JP2KEssenceCompression_IMFProfile_2K_Reversible_4_0, // 442
+	MDD_JP2KEssenceCompression_IMFProfile_2K_Reversible_5_0, // 443
+	MDD_JP2KEssenceCompression_IMFProfile_2K_Reversible_6_0, // 444
+	MDD_JP2KEssenceCompression_IMFProfile_4K_Reversible_1_0, // 445
+	MDD_JP2KEssenceCompression_IMFProfile_4K_Reversible_2_0, // 446
+	MDD_JP2KEssenceCompression_IMFProfile_4K_Reversible_3_0, // 447
+	MDD_JP2KEssenceCompression_IMFProfile_4K_Reversible_4_0, // 448
+	MDD_JP2KEssenceCompression_IMFProfile_4K_Reversible_5_0, // 449
+	MDD_JP2KEssenceCompression_IMFProfile_4K_Reversible_6_0, // 450
+	MDD_JP2KEssenceCompression_IMFProfile_4K_Reversible_7_0, // 451
+	MDD_JP2KEssenceCompression_IMFProfile_4K_Reversible_8_0, // 452
+	MDD_JP2KEssenceCompression_IMFProfile_8K_Reversible_1_0, // 453
+	MDD_JP2KEssenceCompression_IMFProfile_8K_Reversible_2_0, // 454
+	MDD_JP2KEssenceCompression_IMFProfile_8K_Reversible_3_0, // 455
+	MDD_JP2KEssenceCompression_IMFProfile_8K_Reversible_4_0, // 456
+	MDD_JP2KEssenceCompression_IMFProfile_8K_Reversible_5_0, // 457
+	MDD_JP2KEssenceCompression_IMFProfile_8K_Reversible_6_0, // 458
+	MDD_JP2KEssenceCompression_IMFProfile_8K_Reversible_7_0, // 459
+	MDD_JP2KEssenceCompression_IMFProfile_8K_Reversible_8_0, // 460
+	MDD_JP2KEssenceCompression_IMFProfile_8K_Reversible_9_0, // 461
+	MDD_JP2KEssenceCompression_IMFProfile_8K_Reversible_10_0, // 462
+	MDD_SMPTE382MDefaultUncompressedSoundCoding, // 463
+	MDD_PIMFDynamicMetadataWrappingFrame, // 464
+	MDD_PIMFDynamicMetadataEssence, // 465
+	MDD_PIMFDynamicMetadataDescriptor, // 466
+	MDD_PIMFDynamicMetadataDescriptor_GlobalPayloadSID, // 467
 	
-		MDD_ColorPrimaries_BT709, //
-		MDD_ColorPrimaries_BT2020,
-		MDD_ColorPrimaries_P3D65,
-		MDD_ColorPrimaries_XYZ,
-
-
-		MDD_GenericPictureEssenceDescriptor_MasteringDisplayPrimaries,
-		MDD_GenericPictureEssenceDescriptor_MasteringDisplayWhitePointChromaticity,
-		MDD_GenericPictureEssenceDescriptor_MasteringDisplayMaximumLuminance,
-		MDD_GenericPictureEssenceDescriptor_MasteringDisplayMinimumLuminance,
-
-		MDD_JP2KEssenceCompression_IMFProfile_2K_Lossy, //
-		MDD_JP2KEssenceCompression_IMFProfile_4K_Lossy,
-		MDD_JP2KEssenceCompression_IMFProfile_8K_Lossy,
-
-		MDD_JP2KEssenceCompression_IMFProfile_2K_Reversible,
-		MDD_JP2KEssenceCompression_IMFProfile_4K_Reversible,
-		MDD_JP2KEssenceCompression_IMFProfile_8K_Reversible,
-		
-		MDD_JP2KEssenceCompression_IMFProfile_4K_Lossy_1_1, //
-		MDD_JP2KEssenceCompression_IMFProfile_4K_Lossy_2_1, //
-		MDD_JP2KEssenceCompression_IMFProfile_4K_Lossy_3_1,
-		MDD_JP2KEssenceCompression_IMFProfile_4K_Lossy_4_1,
-		MDD_JP2KEssenceCompression_IMFProfile_4K_Lossy_4_2,
-		MDD_JP2KEssenceCompression_IMFProfile_4K_Lossy_5_1,
-		MDD_JP2KEssenceCompression_IMFProfile_4K_Lossy_5_2,
-		MDD_JP2KEssenceCompression_IMFProfile_4K_Lossy_5_3,
-		MDD_JP2KEssenceCompression_IMFProfile_4K_Lossy_6_1,
-		MDD_JP2KEssenceCompression_IMFProfile_4K_Lossy_6_2,
-		MDD_JP2KEssenceCompression_IMFProfile_4K_Lossy_6_3,
-		MDD_JP2KEssenceCompression_IMFProfile_4K_Lossy_6_4,
-
-		MDD_JP2KEssenceCompression_IMFProfile_4K_Lossy_7_1,
-		MDD_JP2KEssenceCompression_IMFProfile_4K_Lossy_7_2,
-		MDD_JP2KEssenceCompression_IMFProfile_4K_Lossy_7_3,
-		MDD_JP2KEssenceCompression_IMFProfile_4K_Lossy_7_4,
-		MDD_JP2KEssenceCompression_IMFProfile_4K_Lossy_7_5,
-		
-		MDD_JP2KEssenceCompression_IMFProfile_4K_Lossy_8_1,
-		MDD_JP2KEssenceCompression_IMFProfile_4K_Lossy_8_2,
-		MDD_JP2KEssenceCompression_IMFProfile_4K_Lossy_8_3,
-		MDD_JP2KEssenceCompression_IMFProfile_4K_Lossy_8_4,
-		MDD_JP2KEssenceCompression_IMFProfile_4K_Lossy_8_5,
-		MDD_JP2KEssenceCompression_IMFProfile_4K_Lossy_8_6,
-		
-		MDD_JP2KEssenceCompression_IMFProfile_2K_Reversible_1_0,
-		MDD_JP2KEssenceCompression_IMFProfile_2K_Reversible_2_0,
-		MDD_JP2KEssenceCompression_IMFProfile_2K_Reversible_3_0,
-		MDD_JP2KEssenceCompression_IMFProfile_2K_Reversible_4_0,
-		MDD_JP2KEssenceCompression_IMFProfile_2K_Reversible_5_0,
-		MDD_JP2KEssenceCompression_IMFProfile_2K_Reversible_6_0,
-		
-		MDD_JP2KEssenceCompression_IMFProfile_4K_Reversible_1_0,
-		MDD_JP2KEssenceCompression_IMFProfile_4K_Reversible_2_0,
-		MDD_JP2KEssenceCompression_IMFProfile_4K_Reversible_3_0,
-		MDD_JP2KEssenceCompression_IMFProfile_4K_Reversible_4_0,
-		MDD_JP2KEssenceCompression_IMFProfile_4K_Reversible_5_0,
-		MDD_JP2KEssenceCompression_IMFProfile_4K_Reversible_6_0,
-		MDD_JP2KEssenceCompression_IMFProfile_4K_Reversible_7_0,
-		MDD_JP2KEssenceCompression_IMFProfile_4K_Reversible_8_0,
-		
-    MDD_JP2KEssenceCompression_IMFProfile_8K_Reversible_1_0,
-	MDD_JP2KEssenceCompression_IMFProfile_8K_Reversible_2_0,
-	MDD_JP2KEssenceCompression_IMFProfile_8K_Reversible_3_0,
-	MDD_JP2KEssenceCompression_IMFProfile_8K_Reversible_4_0,
-	MDD_JP2KEssenceCompression_IMFProfile_8K_Reversible_5_0,
-	MDD_JP2KEssenceCompression_IMFProfile_8K_Reversible_6_0,
-	MDD_JP2KEssenceCompression_IMFProfile_8K_Reversible_7_0,
-	MDD_JP2KEssenceCompression_IMFProfile_8K_Reversible_8_0,
-	MDD_JP2KEssenceCompression_IMFProfile_8K_Reversible_9_0,
-	MDD_JP2KEssenceCompression_IMFProfile_8K_Reversible_10_0,
-
-	MDD_SMPTE382MDefaultUncompressedSoundCoding,
-		
         MDD_Max
     }; // enum MDD_t