diff options
| author | Eric Laurent <elaurent@google.com> | 2012-10-23 08:33:37 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-10-23 08:33:37 -0700 |
| commit | 9710001a79a914c7d1cffbaca362de12cd84c820 (patch) | |
| tree | 37dd09f5b550cd97343061db03c1d2689f4cf5a7 /media | |
| parent | 790382e5f7e18672dce955747b8afd09a5e6cf04 (diff) | |
| parent | 9cdf6db50c0dab30f32291bf00c702ca79132674 (diff) | |
| download | frameworks_av-9710001a79a914c7d1cffbaca362de12cd84c820.zip frameworks_av-9710001a79a914c7d1cffbaca362de12cd84c820.tar.gz frameworks_av-9710001a79a914c7d1cffbaca362de12cd84c820.tar.bz2 | |
am 9cdf6db5: am 5f6f5b7d: Merge "stagefright: discard audio at start of capture" into jb-mr1-dev
* commit '9cdf6db50c0dab30f32291bf00c702ca79132674':
stagefright: discard audio at start of capture
Diffstat (limited to 'media')
| -rw-r--r-- | media/libmedia/MediaProfiles.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/media/libmedia/MediaProfiles.cpp b/media/libmedia/MediaProfiles.cpp index 48bbf8f..8319cd7 100644 --- a/media/libmedia/MediaProfiles.cpp +++ b/media/libmedia/MediaProfiles.cpp @@ -373,7 +373,7 @@ MediaProfiles::getCameraId(const char** atts) void MediaProfiles::addStartTimeOffset(int cameraId, const char** atts) { - int offsetTimeMs = 700; + int offsetTimeMs = 1000; if (atts[2]) { CHECK(!strcmp("startOffsetMs", atts[2])); offsetTimeMs = atoi(atts[3]); |