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

List:       helix-datatype-cvs
Subject:    [Datatype-cvs] aac/fileformat aacff.cpp,1.33.2.2.4.1,1.33.2.2.4.2
From:       yuanzhang () helixcommunity ! org
Date:       2012-08-28 4:10:44
[Download RAW message or body]

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

Modified Files:
      Tag: macrealplayer_cartwheel_rpspgold
	aacff.cpp 
Log Message:
fix macrp bug 406828

merge more code from bug 406648 code branch


Index: aacff.cpp
===================================================================
RCS file: /cvsroot/datatype/aac/fileformat/aacff.cpp,v
retrieving revision 1.33.2.2.4.1
retrieving revision 1.33.2.2.4.2
diff -u -d -r1.33.2.2.4.1 -r1.33.2.2.4.2
--- aacff.cpp	21 Aug 2012 03:02:48 -0000	1.33.2.2.4.1
+++ aacff.cpp	28 Aug 2012 04:10:35 -0000	1.33.2.2.4.2
@@ -35,9 +35,9 @@
 /****************************************************************************
  *  Includes
  */
+#include "aacff.ver"
 #include "hxtypes.h"
 #include "hxcom.h"
-#include "hxerror.h"
 #include "hxplugn.h"
 #include "ihxpckts.h"
 #include "hxformt.h"
@@ -62,7 +62,6 @@
 #ifdef HELIX_FEATURE_AAC_FILEFORMAT_RAPACK
 #include "aacpayld.h"
 #endif //HELIX_FEATURE_AAC_FILEFORMAT_RAPACK
-#include "aacff.ver"
 #include "seektable.h"
 #include "aacfiletypes.h"
 #include "bitstream.h"
@@ -764,9 +763,7 @@
 					{
 						HXLOGL2(HXLOG_AACF, "PacketReady status=HXR_INVALID_FILE");
 						retVal = m_pFormatResponse->PacketReady(HXR_INVALID_FILE, NULL);
-						retVal = m_pFormatResponse->StreamDone(0);
-
-						/*if (m_pContext)
+						if (m_pContext)
 						{
 							// QI for IHXErrorMessages
 							IHXErrorMessages* pErrMsg = NULL;
@@ -777,8 +774,7 @@
 								pErrMsg->Report(HXLOG_ERR, HXR_INVALID_FILE, 0, NULL, NULL);
 							}
 							HX_RELEASE(pErrMsg);
-						}*/
-
+						}
 					}
                 }
                 break;


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