Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 5c43a7af: 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

Browse Source 
Merge commit '5c43a7af7b9530016b922ddec0401ab9199cd595' into gingerbread-plus-aosp

* commit '5c43a7af7b9530016b922ddec0401ab9199cd595':
  When 32-bit offset is used,
This commit is contained in:
James Dong
2010-09-09 10:15:29 -07:00
committed by Android Git Automerger
parent ff54538096 5c43a7af7b
commit e19df3dca1
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
media/libstagefright/MPEG4Writer.cpp
View File

@@ -346,9 +346,10 @@ status_t MPEG4Writer::start(MetaData *param) {
// If file size is set to be larger than the 32 bit file // If file size is set to be larger than the 32 bit file
// size limit, treat it as an error. // size limit, treat it as an error.
if (mMaxFileSizeLimitBytes > kMax32BitFileSize) { if (mMaxFileSizeLimitBytes > kMax32BitFileSize) {
LOGE("32-bit file size limit too big: %lld bytes", LOGW("32-bi file size limit (%lld bytes) too big. "
mMaxFileSizeLimitBytes); "It is changed to %lld bytes",
return UNKNOWN_ERROR; mMaxFileSizeLimitBytes, kMax32BitFileSize);
mMaxFileSizeLimitBytes = kMax32BitFileSize;
} }
} }