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 | eba2d0611923ad75c3b894ebe5ce3d5fc7f6a946 (patch) | |
| tree | 10a20b23aecb65c2e05adb4c9fe634c0699aec04 /include | |
| parent | 8805043df9bba6206839b3a754f2bca4f62a1721 (diff) | |
| parent | 11e69dea99ca2ace7bf8eb56ce6f6528fc906813 (diff) | |
| download | frameworks_av-eba2d0611923ad75c3b894ebe5ce3d5fc7f6a946.zip frameworks_av-eba2d0611923ad75c3b894ebe5ce3d5fc7f6a946.tar.gz frameworks_av-eba2d0611923ad75c3b894ebe5ce3d5fc7f6a946.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; |