Move to 32-bit-based pipeline.

diff --git a/README b/README
index 282cb7b84391994fb0ee76080cc8c7bcd128986f..bfbcc9680b6f7a52d10b1ab67faf2fa35027bd75 100755 (executable)
--- a/README
+++ b/README
@@ -116,7 +116,7 @@ utilities all respond to -h.
 
 
 Change History
-2008.02.01 - SMPTE format fixes, bug fixes v.1.3.18
+2008.02.05 - SMPTE format fixes, bug fixes v.1.3.18
  o Added correct SMPTE UL for StereoscopicPictureSubDescriptor.
  o Exposed JP2K metadata parser as ParseMetadataIntoDesc().
  o Added simple stereoscopic framebuffer to support paired ReadFrame()
@@ -124,6 +124,11 @@ Change History
    single-buffer code).
  o Improved detection of JPEG Interop stereoscopic files.
  o Win32 build fixes (Thanks to Mike Crowe at DTS).
+ o Added the WITH_MD macro to the makefile. Set this value to one
+   to build Win32 with /MD[d] instead of /MT[d].
+ o The Generic Container UL has been added to the EssenceContainers
+   set in the header partition pack for encrypted files. It has always
+   been there in plaintext files.
  - Below this point the changes are internal and should not affect you
    unless you use Kumu directly.
  o Major refactoring of KM_log.[h|cpp].

diff --git a/src/h__Writer.cpp b/src/h__Writer.cpp
index 4e5bafeb9599f2423185672817e50a7828b32793..451796654be01e5e0acd649aed43549015cdbf0e 100755 (executable)
--- a/src/h__Writer.cpp
+++ b/src/h__Writer.cpp
@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2004-2007, John Hurst
+Copyright (c) 2004-2008, John Hurst
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
@@ -358,8 +358,11 @@ ASDCP::h__Writer::AddEssenceDescriptor(const UL& WrappingUL)
   m_HeaderPart.m_Preface->PrimaryPackage = m_FilePackage->InstanceUID;
 
   //
-  // Encryption Descriptor
+  // Essence Descriptors
   //
+  UL GenericContainerUL(Dict::ul(MDD_GCMulti));
+  m_HeaderPart.EssenceContainers.push_back(GenericContainerUL);
+
   if ( m_Info.EncryptedEssence )
     {
       UL CryptEssenceUL(Dict::ul(MDD_EncryptedContainerLabel));
@@ -369,7 +372,6 @@ ASDCP::h__Writer::AddEssenceDescriptor(const UL& WrappingUL)
     }
   else
     {
-      m_HeaderPart.EssenceContainers.push_back(UL(Dict::ul(MDD_GCMulti)));
       m_HeaderPart.EssenceContainers.push_back(WrappingUL);
     }