commit 30e3eb619f02cf36e6d1d31be528d6be552bb3e2
author James Dong <jdong@google.com> Fri Jul 30 14:33:05 2010 -0700
committer Android Git Automerger <android-git-automerger@android.com> Fri Jul 30 14:33:05 2010 -0700
tree dea281b68cbb9b22f33b764fe7f46650b27223d9
parent 3768ac8b7a7713c2dd1b7cdc70ddf760003d5e53
parent 6e5ea76da60c253dee7f07ecf3503ad43a0aff92

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

media/libmediaplayerservice/StagefrightRecorder.cpp

diff --git a/media/libmediaplayerservice/StagefrightRecorder.cpp b/media/libmediaplayerservice/StagefrightRecorder.cpp
index b982f93..8cdb9b0 100644
--- a/media/libmediaplayerservice/StagefrightRecorder.cpp
+++ b/media/libmediaplayerservice/StagefrightRecorder.cpp
@@ -345,7 +345,7 @@
 
 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;
     }