diff options
| author | James Dong <jdong@google.com> | 2010-10-04 18:39:52 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-10-04 18:39:52 -0700 |
| commit | a86a6c4e326bfdfc351dacca95b23bb78f78efbe (patch) | |
| tree | 5c7b2072a20be1393f9e02144527d39a786ed5a9 /include | |
| parent | c7bfb13fd92cda6ae5894ed2ee63e1ab4d7b25ee (diff) | |
| parent | 6f1c7bda39774fe3a1febf72b03c8ad481c1ea54 (diff) | |
| download | frameworks_base-a86a6c4e326bfdfc351dacca95b23bb78f78efbe.zip frameworks_base-a86a6c4e326bfdfc351dacca95b23bb78f78efbe.tar.gz frameworks_base-a86a6c4e326bfdfc351dacca95b23bb78f78efbe.tar.bz2 | |
am 6f1c7bda: Merge "Fixed an issue where the reserved free space in the file writer was larger than intended" into gingerbread
Merge commit '6f1c7bda39774fe3a1febf72b03c8ad481c1ea54' into gingerbread-plus-aosp
* commit '6f1c7bda39774fe3a1febf72b03c8ad481c1ea54':
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; |