summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorMarco Nelissen <marcone@google.com>2014-01-17 11:19:50 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2014-01-17 11:19:50 -0800
commit319c5640ca2e5838e35faaddc47df00174dac1b5 (patch)
treedb03d45d4594d030509635bb678c0909150d9ede /include
parentfd0daeb3fd20ba1c0a0fae530ea263e382a811e5 (diff)
parent07a017d3ff9cb36e47649a9de28e469415eb8103 (diff)
downloadframeworks_av-319c5640ca2e5838e35faaddc47df00174dac1b5.zip
frameworks_av-319c5640ca2e5838e35faaddc47df00174dac1b5.tar.gz
frameworks_av-319c5640ca2e5838e35faaddc47df00174dac1b5.tar.bz2
am 07a017d3: Merge "Added support for ID3v2 meta data in 3gp files"
* commit '07a017d3ff9cb36e47649a9de28e469415eb8103': Added support for ID3v2 meta data in 3gp files
Diffstat (limited to 'include')
-rw-r--r--include/media/stagefright/MetaData.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/include/media/stagefright/MetaData.h b/include/media/stagefright/MetaData.h
index 3a87474..db8216b 100644
--- a/include/media/stagefright/MetaData.h
+++ b/include/media/stagefright/MetaData.h
@@ -215,6 +215,8 @@ public:
bool findData(uint32_t key, uint32_t *type,
const void **data, size_t *size) const;
+ bool hasData(uint32_t key) const;
+
void dumpToLog() const;
protected: