[prev in list] [next in list] [prev in thread] [next in thread] 

List:       helix-datatype-cvs
Subject:    [Datatype-cvs] mp4/fileformat atomizer.cpp,1.21,1.22
From:       sgrosdes () helixcommunity ! org
Date:       2008-10-29 17:04:35
Message-ID: 200810291711.m9THBkae014533 () mailer ! progressive-comp ! com
[Download RAW message or body]

Update of /cvsroot/datatype/mp4/fileformat
In directory cvs01.internal.helixcommunity.org:/tmp/cvs-serv15959/fileformat

Modified Files:
	atomizer.cpp 
Log Message:
ÐÏࡱá

Index: atomizer.cpp
===================================================================
RCS file: /cvsroot/datatype/mp4/fileformat/atomizer.cpp,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- atomizer.cpp	17 Dec 2007 05:19:47 -0000	1.21
+++ atomizer.cpp	29 Oct 2008 17:04:32 -0000	1.22
@@ -652,8 +652,13 @@
 
 		    AtomType = CQTAtom::GetUL32(pHeader->pType);
 		    ulAtomSize = CQTAtom::GetUL32(pHeader->pSize);
-
-		    if (AtomType == 0)
+			
+		    if (ulAtomSize == 0)
+		    {
+			// This Atom extends to the of enclosing container
+			ulAtomSize = ATOMIZE_ALL;
+		    }
+		    else if (AtomType == 0)
 		    {
 			if (m_State == ATMZR_ProcHeader)
 			{
@@ -672,11 +677,6 @@
 			ReadDataCB(QT_EXTENDED_SIZE);
 			return retVal;
 		    }
-		    else if (ulAtomSize == 0)
-		    {
-			// This Atom extends to the of enclosing container
-			ulAtomSize = ATOMIZE_ALL;
-		    }
 
 		    // drop to case below;
 		    m_State = ATMZR_MakeAtom;


_______________________________________________
Datatype-cvs mailing list
Datatype-cvs@helixcommunity.org
http://lists.helixcommunity.org/mailman/listinfo/datatype-cvs
[prev in list] [next in list] [prev in thread] [next in thread]