From f457a7ea8fa446b71e7802a20f575ae5bcc9926b Mon Sep 17 00:00:00 2001
From: jhurst <jhurst@cinecert.com>
Date: Wed, 26 Sep 2007 18:31:20 +0000
Subject: stereoscopic JP2K writing

---
 src/AS_DCP_MXF.cpp | 21 ++++++---------------
 1 file changed, 6 insertions(+), 15 deletions(-)

(limited to 'src/AS_DCP_MXF.cpp')

diff --git a/src/AS_DCP_MXF.cpp b/src/AS_DCP_MXF.cpp
index 247c2da..5afd293 100755
--- a/src/AS_DCP_MXF.cpp
+++ b/src/AS_DCP_MXF.cpp
@@ -149,21 +149,12 @@ ASDCP::EssenceType(const char* filename, EssenceType_t& type)
       type = ESS_UNKNOWN;
       if ( ASDCP_SUCCESS(TestHeader.GetMDObjectByType(OBJ_TYPE_ARGS(RGBAEssenceDescriptor))) )
 	type = ESS_JPEG_2000;
-      else
-	{
-	  if ( ASDCP_SUCCESS(TestHeader.GetMDObjectByType(OBJ_TYPE_ARGS(WaveAudioDescriptor))) )
-	    type = ESS_PCM_24b_48k;
-	  else
-	    {
-	      if ( ASDCP_SUCCESS(TestHeader.GetMDObjectByType(OBJ_TYPE_ARGS(MPEG2VideoDescriptor))) )
-		type = ESS_MPEG2_VES;
-	      else
-		{
-		  if ( ASDCP_SUCCESS(TestHeader.GetMDObjectByType(OBJ_TYPE_ARGS(DCTimedTextDescriptor))) )
-		    type = ESS_TIMED_TEXT;
-		}
-	    }
-	}
+      else if ( ASDCP_SUCCESS(TestHeader.GetMDObjectByType(OBJ_TYPE_ARGS(WaveAudioDescriptor))) )
+	type = ESS_PCM_24b_48k;
+      else if ( ASDCP_SUCCESS(TestHeader.GetMDObjectByType(OBJ_TYPE_ARGS(MPEG2VideoDescriptor))) )
+	type = ESS_MPEG2_VES;
+      else if ( ASDCP_SUCCESS(TestHeader.GetMDObjectByType(OBJ_TYPE_ARGS(DCTimedTextDescriptor))) )
+	type = ESS_TIMED_TEXT;
     }
 
   return result;
-- 
cgit v1.2.3