--- a/rtp/rtpstack/src/rtppacket.cpp	Tue Aug 31 15:32:57 2010 +0300
+++ b/rtp/rtpstack/src/rtppacket.cpp	Wed Sep 01 12:27:36 2010 +0100
@@ -123,8 +123,8 @@
      *                          *
      *    2 bit = version       *
      *    1 bit = padding       *
-     *    1 bit = extension     *
-     *    4 bit = CRSRC Count   *
+     *    1 bit = CRSRC Count   *
+     *    4 bit = extension     *
      ****************************/
     
     //version (2 bit)
@@ -143,17 +143,13 @@
         dataP[0] |= ( 1 << 4 );
         }
 
-    // CC 4 bit)
-    if( aInitParam->TRTP.numCSRC)
-        {
-        dataP[0] |= aInitParam->TRTP.numCSRC;
-        }
+    // CC = 0 (1 bit)
     
     /****************************
      * dataP[1] = 8 bit         *
      *                          *
      *    1 bit = marker        *
-     *    7 bits = payload type  *
+     *    1 bit = payload type  *
      ****************************/
     
     // marker (1 bit)
@@ -186,15 +182,6 @@
 
     //set the pointer to point to the first bit after SSRC
     dataP += 4;
-    
-    
-    //Set CSRC if Present
-    for(TInt count = 0; count<aInitParam->TRTP.numCSRC; count++)
-        {
-        Write32( dataP, (*aInitParam->TRTP.iCsrcList)[count]);
-        dataP += 4;
-        }
-    
 
     if ( aInitParam->TRTP.fHeaderExtension )
         {
@@ -688,7 +675,7 @@
         // Originally Allocate memory for all CSRC:s
         //it will have memeory resouce problem so only allocate when
         // CSRC<2
-        if ( aExtractParam->TRTP.numCSRC <= KCSRCListMax )
+        if ( aExtractParam->TRTP.numCSRC < KCSRCListMax )
         	{
         	if ( !aExtractParam->TRTP.CSRCarray )
 	        	{