--- a/camcordermmfplugin/filecomposer/Src/CamC3GPDataSinkImp.cpp	Thu Dec 17 08:51:24 2009 +0200
+++ b/camcordermmfplugin/filecomposer/Src/CamC3GPDataSinkImp.cpp	Tue Jan 26 12:06:59 2010 +0200
@@ -97,8 +97,6 @@
 CCamC3GPDataSinkImp::~CCamC3GPDataSinkImp(void)
     {
     PRINT(_L("CCamC3GPDataSinkImp::~CCamC3GPDataSinkImp enter"));
-    delete [] iVideoBuffer;
-    delete [] iAudioBuffer;
 
     if ( iFileName != KNullDesC )
         {
@@ -122,6 +120,8 @@
         iFS = NULL;
         }
 
+    delete [] iVideoBuffer;
+    delete [] iAudioBuffer;
     iObserver = NULL;
     iMMFFile = NULL; // not owned
     iFile = NULL; // not owned

--- a/camcordermmfplugin/mediarecorder/Src/CCMRMDFVideoRecorder.cpp	Thu Dec 17 08:51:24 2009 +0200
+++ b/camcordermmfplugin/mediarecorder/Src/CCMRMDFVideoRecorder.cpp	Tue Jan 26 12:06:59 2010 +0200
@@ -1881,8 +1881,12 @@
             iDevVideoRec->FindEncodersL(iMimeType, 0 /* aPreProc */, iAvailableVideoEncoders, EFalse );
             PRINT((_L("CCMRVideoRecorder::SetVideoCodecL() search found %d encoder(s)"), iAvailableVideoEncoders.Count() ));
             }
-        iConfig->SetVideoCodec(iMimeType);
-        iConfig->SetVideoPixelAspectRatio(numerator, denominator);
+        
+        if ( iConfig )
+            {
+            iConfig->SetVideoCodec(iMimeType);
+            iConfig->SetVideoPixelAspectRatio(numerator, denominator);
+            }
 
         UpdateSupportedVideoFrameSizesRates();