commit c2945f514a66ac3ec2972f8d9dbb6219bb8f243a
author James Dong <jdong@google.com> Fri Oct 01 17:35:40 2010 -0700
committer Android Git Automerger <android-git-automerger@android.com> Fri Oct 01 17:35:40 2010 -0700
tree 4b18a171011cb1608a34f70946c622187ca855d3
parent b0a3b13b847481c3656f8119f3abd4f746eb2a89
parent 97b4b6461f61f14f19cee147531de619816b11a7

am 2bf74b8f: am 6c609b6a: Merge "Turn off media time adjustment by default" into gingerbread

Merge commit '2bf74b8f0ad59b1379534e760a356adeb3673fd2'

* commit '2bf74b8f0ad59b1379534e760a356adeb3673fd2':
  Turn off media time adjustment by default

media/libstagefright/MPEG4Writer.cpp

diff --git a/media/libstagefright/MPEG4Writer.cpp b/media/libstagefright/MPEG4Writer.cpp
index e6c2f7e..546df47 100644
--- a/media/libstagefright/MPEG4Writer.cpp
+++ b/media/libstagefright/MPEG4Writer.cpp
@@ -1118,7 +1118,7 @@
         startTimeUs = 0;
     }
 
-    mIsRealTimeRecording = true;
+    mIsRealTimeRecording = false;
     {
         int32_t isNotRealTime;
         if (params && params->findInt32(kKeyNotRealTime, &isNotRealTime)) {