From f6382ee078c3d7de2dbf3a01f5624345d2c61e4a Mon Sep 17 00:00:00 2001 From: jhurst Date: Thu, 13 May 2010 19:12:13 +0000 Subject: release candidate --- src/AS_DCP_JP2K.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'src/AS_DCP_JP2K.cpp') diff --git a/src/AS_DCP_JP2K.cpp b/src/AS_DCP_JP2K.cpp index 86327c2..51cc017 100755 --- a/src/AS_DCP_JP2K.cpp +++ b/src/AS_DCP_JP2K.cpp @@ -1,5 +1,5 @@ /* -Copyright (c) 2004-2009, John Hurst +Copyright (c) 2004-2010, John Hurst All rights reserved. Redistribution and use in source and binary forms, with or without @@ -834,11 +834,6 @@ lh__Writer::SetSourceStream(const PictureDescriptor& PDesc, const std::string& l m_PDesc = PDesc; Result_t result = JP2K_PDesc_to_MD(m_PDesc); - if ( ASDCP_SUCCESS(result) ) - result = WriteMXFHeader(label, UL(m_Dict->ul(MDD_JPEG_2000Wrapping)), - PICT_DEF_LABEL, UL(m_Dict->ul(MDD_PictureDataDef)), - LocalEditRate, 24 /* TCFrameRate */); - if ( ASDCP_SUCCESS(result) ) { memcpy(m_EssenceUL, m_Dict->ul(MDD_JPEG2000Essence), SMPTE_UL_LENGTH); @@ -846,6 +841,11 @@ lh__Writer::SetSourceStream(const PictureDescriptor& PDesc, const std::string& l result = m_State.Goto_READY(); } + if ( ASDCP_SUCCESS(result) ) + result = WriteMXFHeader(label, UL(m_Dict->ul(MDD_JPEG_2000Wrapping)), + PICT_DEF_LABEL, UL(m_EssenceUL), UL(m_Dict->ul(MDD_PictureDataDef)), + LocalEditRate, 24 /* TCFrameRate */); + return result; } -- cgit v1.2.3