--- common/video/mpeg4-2000/tools/entropy/huffman.cpp.orig	Tue Sep 28 22:51:26 2004
+++ common/video/mpeg4-2000/tools/entropy/huffman.cpp	Tue Sep 28 22:51:47 2004
@@ -243,9 +243,6 @@
 Void CHuffmanTree::printStatistics (Double dEntropy, Double dNOfBits, ostream &stream)
 {
     stream<<endl<<endl;
-    stream<<"//Entropy Per Symbol : "<<dEntropy<<endl;
-    stream<<"//Bits Per Symbol    : "<<dNOfBits<<endl;
-    stream<<"//Table Efficiency   : "<<dEntropy/dNOfBits<<endl;
 }
 
 Int CHuffmanCoDec::makeIndexFromSymbolInTable(istream &huffmanTable)  
--- common/video/mpeg4-2000/tools/entropy/bitstrm.cpp.orig	Tue Sep 28 22:56:07 2004
+++ common/video/mpeg4-2000/tools/entropy/bitstrm.cpp	Tue Sep 28 22:56:25 2004
@@ -323,7 +323,6 @@
 	if (m_pstrmTrace != NULL)	{
 		m_pstrmTrace->width (20);
 		(*m_pstrmTrace) << rgchSymbolName << "= ";
-		(*m_pstrmTrace) << fltValue << "\n";
 		m_pstrmTrace->flush ();
 	}
 }
@@ -356,8 +355,6 @@
 	if (m_pstrmTrace != NULL)	{
 		m_pstrmTrace->width (20);
 		(*m_pstrmTrace) << rgchSymbolName << "= ";
-		(*m_pstrmTrace) << vctValue.x << ", ";
-		(*m_pstrmTrace) << vctValue.y << "\n ";
 		m_pstrmTrace->flush ();
 	}
 }
--- common/video/mpeg4-2000/sys/mode.cpp.orig	Tue Sep 28 23:05:10 2004
+++ common/video/mpeg4-2000/sys/mode.cpp	Tue Sep 28 23:05:59 2004
@@ -409,12 +409,6 @@
 //	if (bVOPPrint)
 		cout << "\t" << "Shape:" << "\t\t\t" << nBitsShape << "\n";
 	cout << "\t" << "Total:" << "\t\t\t" << nBitsTotal << "\n";
-	cout << "\t" << "SNR Y:" << "\t\t\t" << dSNRY / nVOPs << " dB\n";
-	cout << "\t" << "SNR U:" << "\t\t\t" << dSNRU / nVOPs << " dB\n";
-	cout << "\t" << "SNR V:" << "\t\t\t" << dSNRV / nVOPs << " dB\n";
-  for(Int iAuxComp=0;iAuxComp<m_iAuxCompCount;iAuxComp++)  // MAC (SB) 26-Nov-99
-	  cout << "\t" << "SNR A[" << iAuxComp << "]:" << "\t\t" << dSNRA[iAuxComp] / nVOPs << " dB\n";
-	cout << "\n\t" << "average Qp:" << "\t\t" << (Double)nQp / nQMB << "\n\n";
 	cout.flush ();
 }
