Merge branch 'master' into sha1_builtin

1 files changed, 5 insertions, 2 deletions

diff --git a/src/AS_DCP_ATMOS.cpp b/src/AS_DCP_ATMOS.cpp
index 2fc7d56..cdba985 100644
--- a/src/AS_DCP_ATMOS.cpp
+++ b/src/AS_DCP_ATMOS.cpp
@@ -132,8 +132,11 @@ ASDCP::ATMOS::MXFReader::h__Reader::MD_to_DCData_DDesc(ASDCP::DCData::DCDataDesc
   ASDCP_TEST_NULL(m_EssenceDescriptor);
   MXF::PrivateDCDataDescriptor* DDescObj = m_EssenceDescriptor;
   DDesc.EditRate = DDescObj->SampleRate;
-  assert(DDescObj->ContainerDuration <= 0xFFFFFFFFL);
-  DDesc.ContainerDuration = static_cast<ui32_t>(DDescObj->ContainerDuration);
+  if ( ! DDescObj->ContainerDuration.empty() )
+    {
+      assert(DDescObj->ContainerDuration <= 0xFFFFFFFFL);
+      DDesc.ContainerDuration = static_cast<ui32_t>(DDescObj->ContainerDuration);
+    }
   memcpy(DDesc.DataEssenceCoding, DDescObj->DataEssenceCoding.Value(), SMPTE_UL_LENGTH);
   return RESULT_OK;
 }