X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fh__Writer.cpp;h=451796654be01e5e0acd649aed43549015cdbf0e;hb=44bc524e3cf74f0903b7fbb51ca2f366f48d3495;hp=06d81c0da6fa6b861fb78a5ae9f43769773d46be;hpb=c5e3e4e83032b790c62bd55795a20dd912010c9f;p=asdcplib.git diff --git a/src/h__Writer.cpp b/src/h__Writer.cpp index 06d81c0..4517966 100755 --- a/src/h__Writer.cpp +++ b/src/h__Writer.cpp @@ -1,5 +1,5 @@ /* -Copyright (c) 2004-2006, 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); }