summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorJames Dong <jdong@google.com>2010-09-03 09:59:05 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-09-03 09:59:05 -0700
commit0e60f5304b51fe168b8c356b0cb3150b321a8d95 (patch)
tree11c5c60f36a391c22973f53b80ca5fddee76bbeb /include
parent4d42bdec8229802945e57a634374e113ff234dfe (diff)
parent3c3fc97e104bd17af608727d82e965fc28f2c89d (diff)
downloadframeworks_base-0e60f5304b51fe168b8c356b0cb3150b321a8d95.zip
frameworks_base-0e60f5304b51fe168b8c356b0cb3150b321a8d95.tar.gz
frameworks_base-0e60f5304b51fe168b8c356b0cb3150b321a8d95.tar.bz2
am 3c3fc97e: am 46e63b34: Merge "Better file size estimate" into gingerbread
Merge commit '3c3fc97e104bd17af608727d82e965fc28f2c89d' * commit '3c3fc97e104bd17af608727d82e965fc28f2c89d': Better file size estimate
Diffstat (limited to 'include')
-rw-r--r--include/media/stagefright/MPEG4Writer.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/include/media/stagefright/MPEG4Writer.h b/include/media/stagefright/MPEG4Writer.h
index 9716e98..52b93e1 100644
--- a/include/media/stagefright/MPEG4Writer.h
+++ b/include/media/stagefright/MPEG4Writer.h
@@ -144,6 +144,7 @@ private:
inline size_t write(const void *ptr, size_t size, size_t nmemb, FILE* stream);
bool exceedsFileSizeLimit();
+ bool use32BitFileOffset() const;
bool exceedsFileDurationLimit();
void trackProgressStatus(const Track* track, int64_t timeUs, status_t err = OK);