diff options
author | James Dong <jdong@google.com> | 2010-09-09 10:13:08 -0700 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-09-09 10:13:08 -0700 |
commit | 4c73f1f95838a9cc86ff7d3beb7388f98eee562a (patch) | |
tree | 6fcd7c60a769d6f5af500a45922f09f3ef7f64dd /media/libstagefright | |
parent | 772bcc27ba7c1fd42c72ecaca55d533328bd18e7 (diff) | |
parent | d2518e0c0a5bffd30b0dccb04fe7bf5b77c354b1 (diff) | |
download | frameworks_av-4c73f1f95838a9cc86ff7d3beb7388f98eee562a.zip frameworks_av-4c73f1f95838a9cc86ff7d3beb7388f98eee562a.tar.gz frameworks_av-4c73f1f95838a9cc86ff7d3beb7388f98eee562a.tar.bz2 |
Merge "When 32-bit offset is used, if the requested max file size is greater than the 32-bit offset limit, set the limit to the max 32-bit offset limit." into gingerbread
Diffstat (limited to 'media/libstagefright')
-rw-r--r-- | media/libstagefright/MPEG4Writer.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/media/libstagefright/MPEG4Writer.cpp b/media/libstagefright/MPEG4Writer.cpp index 806836d..de4233d 100644 --- a/media/libstagefright/MPEG4Writer.cpp +++ b/media/libstagefright/MPEG4Writer.cpp @@ -346,9 +346,10 @@ status_t MPEG4Writer::start(MetaData *param) { // If file size is set to be larger than the 32 bit file // size limit, treat it as an error. if (mMaxFileSizeLimitBytes > kMax32BitFileSize) { - LOGE("32-bit file size limit too big: %lld bytes", - mMaxFileSizeLimitBytes); - return UNKNOWN_ERROR; + LOGW("32-bi file size limit (%lld bytes) too big. " + "It is changed to %lld bytes", + mMaxFileSizeLimitBytes, kMax32BitFileSize); + mMaxFileSizeLimitBytes = kMax32BitFileSize; } } |