summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author James Dong <jdong@google.com> 2010-07-30 14:30:31 -0700
committer Android Git Automerger <android-git-automerger@android.com> 2010-07-30 14:30:31 -0700
commite915b0ef5d574022dfeffc9b2b61e21c1433c89c (patch)
tree44ca958ab7c96fb17648317b3293fd03018386a6
parent903d445f4102f3ae15e370bd10e1745a88905a99 (diff)
parentd973a533da16a1fbf13aa1b58ddf60d7d7c9b4ec (diff)
am d973a533: Merge "Lower the lower bound for max file duration check" into gingerbread
Merge commit 'd973a533da16a1fbf13aa1b58ddf60d7d7c9b4ec' into gingerbread-plus-aosp * commit 'd973a533da16a1fbf13aa1b58ddf60d7d7c9b4ec': 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 f26676da110e..c40d285532e0 100644
--- a/media/libmediaplayerservice/StagefrightRecorder.cpp
+++ b/media/libmediaplayerservice/StagefrightRecorder.cpp
@@ -344,7 +344,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;
}