diff options
| author | Jean-Baptiste Queru <jbq@google.com> | 2012-08-08 14:08:28 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-08-08 14:08:28 -0700 |
| commit | e983aa4ff4d80af7702888e230b9aaa93a7b7e57 (patch) | |
| tree | 09e62e3a573248dd1a3c7b2dae082810f16dfe79 /include | |
| parent | f6a3576006f3fbe7d87ab49c1ebf292be5ddaa24 (diff) | |
| parent | 51af4af2414cdaaf0185b971a41fc0b4f8c0b7e4 (diff) | |
| download | frameworks_av-e983aa4ff4d80af7702888e230b9aaa93a7b7e57.zip frameworks_av-e983aa4ff4d80af7702888e230b9aaa93a7b7e57.tar.gz frameworks_av-e983aa4ff4d80af7702888e230b9aaa93a7b7e57.tar.bz2 | |
am 51af4af2: am e28df5b9: Merge "Store correct time stamps in recorded mp4 files"
* commit '51af4af2414cdaaf0185b971a41fc0b4f8c0b7e4':
Store correct time stamps in recorded mp4 files
Diffstat (limited to 'include')
| -rw-r--r-- | include/media/stagefright/MPEG4Writer.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/media/stagefright/MPEG4Writer.h b/include/media/stagefright/MPEG4Writer.h index cd4e129..3596b38 100644 --- a/include/media/stagefright/MPEG4Writer.h +++ b/include/media/stagefright/MPEG4Writer.h @@ -186,6 +186,8 @@ private: void release(); status_t reset(); + static uint32_t getMpeg4Time(); + MPEG4Writer(const MPEG4Writer &); MPEG4Writer &operator=(const MPEG4Writer &); }; |