diff options
| author | jhurst <jhurst@cinecert.com> | 2010-05-13 19:12:13 +0000 |
|---|---|---|
| committer | jhurst <> | 2010-05-13 19:12:13 +0000 |
| commit | f6382ee078c3d7de2dbf3a01f5624345d2c61e4a (patch) | |
| tree | 9418a7065bdedb15e9551d97743ec1a9b8cd8f71 /src/AS_DCP_JP2K.cpp | |
| parent | 6413d43575d39c8560673515ca7e75e1e2c789a9 (diff) | |
release candidate
Diffstat (limited to 'src/AS_DCP_JP2K.cpp')
| -rwxr-xr-x | src/AS_DCP_JP2K.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
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 @@ -835,17 +835,17 @@ lh__Writer::SetSourceStream(const PictureDescriptor& PDesc, const std::string& l 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); m_EssenceUL[SMPTE_UL_LENGTH-1] = 1; // first (and only) essence container 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; } |