summaryrefslogtreecommitdiffstats
path: root/include/media
diff options
context:
space:
mode:
authorMarco Nelissen <marcone@google.com>2012-09-05 16:22:16 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2012-09-05 16:22:17 -0700
commit9c6cb7a896f41cb8ad2f2ad63f8f6edfbb56ed4f (patch)
tree6c8b0cf1e55f5f778ecfb92b78a7286e82881f02 /include/media
parent0b73d4730202fcad53aefc4314a06e7b95f442f0 (diff)
parent56997121c5031598fbbba7b7c53980b7fd529c2d (diff)
downloadframeworks_av-9c6cb7a896f41cb8ad2f2ad63f8f6edfbb56ed4f.zip
frameworks_av-9c6cb7a896f41cb8ad2f2ad63f8f6edfbb56ed4f.tar.gz
frameworks_av-9c6cb7a896f41cb8ad2f2ad63f8f6edfbb56ed4f.tar.bz2
Merge "Fragmented mp4 extractor" into jb-mr1-dev
Diffstat (limited to 'include/media')
-rw-r--r--include/media/stagefright/Utils.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/include/media/stagefright/Utils.h b/include/media/stagefright/Utils.h
index d87902e..8213af9 100644
--- a/include/media/stagefright/Utils.h
+++ b/include/media/stagefright/Utils.h
@@ -42,6 +42,8 @@ struct MetaData;
struct AMessage;
status_t convertMetaDataToMessage(
const sp<MetaData> &meta, sp<AMessage> *format);
+void convertMessageToMetaData(
+ const sp<AMessage> &format, sp<MetaData> &meta);
} // namespace android