summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author James Dong <jdong@google.com> 2010-07-30 14:33:05 -0700
committer Android Git Automerger <android-git-automerger@android.com> 2010-07-30 14:33:05 -0700
commitaea75231a5af14b6ab0ca57b910d1a2e349f068c (patch)
treefc4ce2d0817ff4f5bf8b29152233ac33a8e2162a
parentf1e4bd2a66e2eb0d64f3fa33f3ad43569316a056 (diff)
parente915b0ef5d574022dfeffc9b2b61e21c1433c89c (diff)
am e915b0ef: am d973a533: Merge "Lower the lower bound for max file duration check" into gingerbread
Merge commit 'e915b0ef5d574022dfeffc9b2b61e21c1433c89c' * commit 'e915b0ef5d574022dfeffc9b2b61e21c1433c89c': Lower the lower bound for max file duration check
-rw-r--r--media/libmediaplayerservice/StagefrightRecorder.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/media/libmediaplayerservice/StagefrightRecorder.cpp b/media/libmediaplayerservice/StagefrightRecorder.cpp
index b982f93a50b2..8cdb9b06232a 100644
--- a/media/libmediaplayerservice/StagefrightRecorder.cpp
+++ b/media/libmediaplayerservice/StagefrightRecorder.cpp
@@ -345,7 +345,7 @@ status_t StagefrightRecorder::setParamVideoEncodingBitRate(int32_t bitRate) {
status_t StagefrightRecorder::setParamMaxFileDurationUs(int64_t timeUs) {
LOGV("setParamMaxFileDurationUs: %lld us", timeUs);
- if (timeUs <= 1000000LL) { // XXX: 1 second
+ if (timeUs <= 100000LL) { // XXX: 100 milli-seconds
LOGE("Max file duration is too short: %lld us", timeUs);
return BAD_VALUE;
}