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

List:       helix-datatype-cvs
Subject:    [Datatype-cvs] mp4/fileformat qttrkmgr.cpp, 1.36.2.5, 1.36.2.6 qtffplin.cpp, 1.98.10.13, 1.98.10.14
From:       xzhao () helixcommunity ! org
Date:       2012-10-16 4:38:13
[Download RAW message or body]

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

Modified Files:
      Tag: hxclient_exp_dash
	qttrkmgr.cpp qtffplin.cpp 
Log Message:
Change the scope of QT_FRAGMENTS macro to pass build without that defined


Index: qtffplin.cpp
===================================================================
RCS file: /cvsroot/datatype/mp4/fileformat/qtffplin.cpp,v
retrieving revision 1.98.10.13
retrieving revision 1.98.10.14
diff -u -d -r1.98.10.13 -r1.98.10.14
--- qtffplin.cpp	2 Jul 2012 05:27:56 -0000	1.98.10.13
+++ qtffplin.cpp	16 Oct 2012 04:38:03 -0000	1.98.10.14
@@ -2665,17 +2665,15 @@
             }
             return ATMZR_CMD_SKIP;
         }
+#ifdef QTCONFIG_FRAGMENTS
         case QT_moof:
         {
             // just stop if we get to an unexpected fragment.
-#ifdef QTCONFIG_FRAGMENTS
             return (m_MovieInfo.HasFragments() &&
                     (m_bProgressiveAtomize || m_State == QTFF_Atomize)) ?
                     ATMZR_CMD_LOAD : ATMZR_CMD_STOP;
-#else
-            return ATMZR_CMD_STOP;
-#endif
         }
+#endif
         default:
         {
             // nothing special

Index: qttrkmgr.cpp
===================================================================
RCS file: /cvsroot/datatype/mp4/fileformat/qttrkmgr.cpp,v
retrieving revision 1.36.2.5
retrieving revision 1.36.2.6
diff -u -d -r1.36.2.5 -r1.36.2.6
--- qttrkmgr.cpp	2 Jul 2012 05:27:06 -0000	1.36.2.5
+++ qttrkmgr.cpp	16 Oct 2012 04:38:03 -0000	1.36.2.6
@@ -1415,7 +1415,11 @@
 
     if (uChildCount > 0)
     {
+#ifdef QTCONFIG_FRAGMENTS
         m_bFragmented = (pMoovAtom->FindPresentChild(QT_mvex) != NULL);
+#else
+        m_bFragmented = FALSE;
+#endif
 
         CQTAtom::ChildIterator i = pMoovAtom->BeginChildren();
 


_______________________________________________
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]