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 | 11e69dea99ca2ace7bf8eb56ce6f6528fc906813 (patch) | |
| tree | 2153c97b42fad60828fa79a30bcbf3a53751689d /include | |
| parent | deed343476e45165ed176c036c8f77b170bacfeb (diff) | |
| parent | a007e8229fb2be4866c483f9cd6c4af238a2da5e (diff) | |
| download | frameworks_av-11e69dea99ca2ace7bf8eb56ce6f6528fc906813.zip frameworks_av-11e69dea99ca2ace7bf8eb56ce6f6528fc906813.tar.gz frameworks_av-11e69dea99ca2ace7bf8eb56ce6f6528fc906813.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; |