diff options
| author | James Dong <jdong@google.com> | 2010-10-06 16:17:14 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-10-06 16:17:14 -0700 |
| commit | 8c4a042984ce9132810f6e79da732ea89e467d6f (patch) | |
| tree | 16d37ccdeb9fd09a0ca5711a23c4c602bc40b119 /include | |
| parent | 664d035829acd35f75fa82826d960efd72da3578 (diff) | |
| parent | a86a6c4e326bfdfc351dacca95b23bb78f78efbe (diff) | |
| download | frameworks_base-8c4a042984ce9132810f6e79da732ea89e467d6f.zip frameworks_base-8c4a042984ce9132810f6e79da732ea89e467d6f.tar.gz frameworks_base-8c4a042984ce9132810f6e79da732ea89e467d6f.tar.bz2 | |
am a86a6c4e: am 6f1c7bda: Merge "Fixed an issue where the reserved free space in the file writer was larger than intended" into gingerbread
Merge commit 'a86a6c4e326bfdfc351dacca95b23bb78f78efbe'
* commit 'a86a6c4e326bfdfc351dacca95b23bb78f78efbe':
Fixed an issue where the reserved free space in the file writer was larger than intended
Diffstat (limited to 'include')
| -rw-r--r-- | include/media/stagefright/MPEG4Writer.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/media/stagefright/MPEG4Writer.h b/include/media/stagefright/MPEG4Writer.h index 70bd8e8..cff38b2 100644 --- a/include/media/stagefright/MPEG4Writer.h +++ b/include/media/stagefright/MPEG4Writer.h @@ -64,6 +64,7 @@ private: FILE *mFile; bool mUse4ByteNalLength; bool mUse32BitOffset; + bool mIsFileSizeLimitExplicitlyRequested; bool mPaused; bool mStarted; off_t mOffset; |