oopsie

2 files changed, 6 insertions, 6 deletions

diff --git a/src/MXF.cpp b/src/MXF.cpp
index 9c53a90..4ba82cd 100755
--- a/src/MXF.cpp
+++ b/src/MXF.cpp
@@ -713,15 +713,15 @@ ASDCP::MXF::OPAtomHeader::InitFromFile(const Kumu::FileReader& Reader)
   UL OPAtomUL(SMPTE_390_OPAtom_Entry().ul);
   UL InteropOPAtomUL(MXFInterop_OPAtom_Entry().ul);
 
-  if ( OperationalPattern == OPAtomUL ) // SMPTE
+  if ( OperationalPattern.ExactMatch(OPAtomUL) ) // SMPTE
     {
       if ( m_Dict == &DefaultCompositeDict() )
 	m_Dict = &DefaultSMPTEDict();
     }
-  else if ( OperationalPattern == InteropOPAtomUL ) // Interop
+  else if ( OperationalPattern.ExactMatch(InteropOPAtomUL) ) // Interop
     {
       if ( m_Dict == &DefaultCompositeDict() )
-      	m_Dict = &DefaultInteropDict();
+	m_Dict = &DefaultInteropDict();
     }
   else
     {
diff --git a/src/h__Reader.cpp b/src/h__Reader.cpp
index d466500..62fa834 100755
--- a/src/h__Reader.cpp
+++ b/src/h__Reader.cpp
@@ -303,14 +303,14 @@ ASDCP::h__Reader::ReadEKLVPacket(ui32_t FrameNum, ui32_t SequenceNum, ASDCP::Fra
 	return RESULT_FORMAT;
 
       // test essence UL
-      if ( UL(ess_p).MatchIgnoreStream(EssenceUL) ) // ignore the stream number
+      if ( ! UL(ess_p).MatchIgnoreStream(EssenceUL) ) // ignore the stream number
 	{
 	  char strbuf[IntBufferLen];
 	  const MDDEntry* Entry = m_Dict->FindUL(Key.Value());
 	  if ( Entry == 0 )
-	    DefaultLogSink().Warn("Unexpected Essence UL found: %s.\n", Key.EncodeString(strbuf, IntBufferLen));
+	    DefaultLogSink().Warn("Unexpected Encrypted Essence UL found: %s.\n", Key.EncodeString(strbuf, IntBufferLen));
 	  else
-	    DefaultLogSink().Warn("Unexpected Essence UL found: %s.\n", Entry->name);
+	    DefaultLogSink().Warn("Unexpected Encrypted Essence UL found: %s.\n", Entry->name);
 	  return RESULT_FORMAT;
 	}
       ess_p += SMPTE_UL_LENGTH;