summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorJean-Baptiste Queru <jbq@google.com>2012-08-08 14:04:18 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2012-08-08 14:04:18 -0700
commit51af4af2414cdaaf0185b971a41fc0b4f8c0b7e4 (patch)
tree3e7a2ca1401597ed506a8725e8a0934a28404024 /include
parentef62009372d050b431939835d4e2c5ee77da8831 (diff)
parente28df5b996af3480b457c7a9908dbb9d52ad8d7c (diff)
downloadframeworks_av-51af4af2414cdaaf0185b971a41fc0b4f8c0b7e4.zip
frameworks_av-51af4af2414cdaaf0185b971a41fc0b4f8c0b7e4.tar.gz
frameworks_av-51af4af2414cdaaf0185b971a41fc0b4f8c0b7e4.tar.bz2
am e28df5b9: Merge "Store correct time stamps in recorded mp4 files"
* commit 'e28df5b996af3480b457c7a9908dbb9d52ad8d7c': Store correct time stamps in recorded mp4 files
Diffstat (limited to 'include')
-rw-r--r--include/media/stagefright/MPEG4Writer.h2
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 &);
};