--- a/multimediacommscontroller/mmccsubcontroller/src/mccsymulstream.cpp	Thu Jul 15 19:04:32 2010 +0300
+++ b/multimediacommscontroller/mmccsubcontroller/src/mccsymulstream.cpp	Thu Aug 19 10:18:22 2010 +0300
@@ -253,12 +253,6 @@
         
         CreatePayloadFormatEncoderL();
         
-       	if ( iDatasink->DataSinkType() == KMccRtpSinkUid )
-       	    {
-            CMccRtpDataSink* dataSink = static_cast<CMccRtpDataSink*>( iDatasink );        
-            dataSink->SetMediaClock( *iRtpMediaClock ); 
-       	    }
-        
         // Just negotiate the codec, load it later
         static_cast<CMccUlDataPath*>( iDatapath )->NegotiateL( *iFormatEncode );
         
@@ -278,6 +272,15 @@
         }
     else if ( CurrentCodecState() == EStateCodecPrepared )
         {
+        if ( iDatasink->DataSinkType() == KMccRtpSinkUid )
+       	    {
+	        CMccRtpDataSink* dataSink = 
+	                static_cast<CMccRtpDataSink*>( iDatasink );
+	            
+	        // For updating keep alive parameters
+	        TMccCodecInfoBuffer infoBuffer( iCodecInfo ); 
+	    	dataSink->ConfigureL( infoBuffer, iRtpMediaClock );
+       	    }
         if ( CodecLoadingAllowed() )
             {
             // Load the codec
@@ -288,15 +291,6 @@
                                                
             UpdateCodecInformationL( iCodecInfo );
             }
-        else if ( iDatasink->DataSinkType() == KMccRtpSinkUid )
-       	    {
-            CMccRtpDataSink* dataSink = 
-                static_cast<CMccRtpDataSink*>( iDatasink );
-            
-            // For updating keep alive parameters
-            TMccCodecInfoBuffer infoBuffer( iCodecInfo );     
-            dataSink->ConfigureL( infoBuffer );
-       	    }
         }
     else if ( CurrentCodecState() == EStateCodecLoaded ||
               CurrentCodecState() == EStateCodecLoadedAndUpdating )
@@ -308,7 +302,7 @@
             
             // For updating keep alive parameters
             TMccCodecInfoBuffer infoBuffer( iCodecInfo );     
-            dataSink->ConfigureL( infoBuffer );
+            dataSink->ConfigureL( infoBuffer, iRtpMediaClock );
        	    }
         // Update codec info
         SetCodecState( EStateCodecLoadedAndUpdating );