diff options
| author | James Dong <jdong@google.com> | 2010-10-01 17:32:16 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-10-01 17:32:16 -0700 |
| commit | 97b4b6461f61f14f19cee147531de619816b11a7 (patch) | |
| tree | 87ba0e44fe1e0c5a7bbe72cc91c5c49a17ba7205 /media | |
| parent | 555e9dc7439d89846f4d76046d45b628e2d7499e (diff) | |
| parent | 1fd01cbce6edb54334579f89e49a679207204619 (diff) | |
| download | frameworks_av-97b4b6461f61f14f19cee147531de619816b11a7.zip frameworks_av-97b4b6461f61f14f19cee147531de619816b11a7.tar.gz frameworks_av-97b4b6461f61f14f19cee147531de619816b11a7.tar.bz2 | |
am 6c609b6a: Merge "Turn off media time adjustment by default" into gingerbread
Merge commit '6c609b6a60e533a93c6d0088222bd8da209b9953' into gingerbread-plus-aosp
* commit '6c609b6a60e533a93c6d0088222bd8da209b9953':
Turn off media time adjustment by default
Diffstat (limited to 'media')
| -rw-r--r-- | media/libstagefright/MPEG4Writer.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
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 @@ status_t MPEG4Writer::Track::start(MetaData *params) { startTimeUs = 0; } - mIsRealTimeRecording = true; + mIsRealTimeRecording = false; { int32_t isNotRealTime; if (params && params->findInt32(kKeyNotRealTime, &isNotRealTime)) { |