3 files changed, 7 insertions, 6 deletions
diff --git a/media/libavextensions/stagefright/AVExtensions.h b/media/libavextensions/stagefright/AVExtensions.h
index 818cdb1..2ebfcde 100644
--- a/media/libavextensions/stagefright/AVExtensions.h
+++ b/media/libavextensions/stagefright/AVExtensions.h
@@ -51,10 +51,11 @@ struct NuCachedSource2;
 struct AVFactory {
     virtual sp<ACodec> createACodec();
     virtual MediaExtractor* createExtendedExtractor(
-            const sp<DataSource> &source, const char *mime, sp<AMessage> *meta);
+            const sp<DataSource> &source, const char *mime,
+            const sp<AMessage> &meta);
     virtual sp<MediaExtractor> updateExtractor(
             sp<MediaExtractor> ext, const sp<DataSource> &source,
-            const char *mime, sp<AMessage> *meta);
+            const char *mime, const sp<AMessage> &meta);
     virtual sp<NuCachedSource2> createCachedSource(
             const sp<DataSource> &source,
             const char *cacheConfig = NULL,
diff --git a/media/libavextensions/stagefright/AVFactory.cpp b/media/libavextensions/stagefright/AVFactory.cpp
index 671c858..fe00f45 100644
--- a/media/libavextensions/stagefright/AVFactory.cpp
+++ b/media/libavextensions/stagefright/AVFactory.cpp
@@ -53,13 +53,13 @@ sp<ACodec> AVFactory::createACodec() {
 }
 
 MediaExtractor* AVFactory::createExtendedExtractor(
-         const sp<DataSource> &, const char *, sp<AMessage> *) {
+         const sp<DataSource> &, const char *, const sp<AMessage> &) {
     return NULL;
 }
 
 sp<MediaExtractor> AVFactory::updateExtractor(
             sp<MediaExtractor> ext, const sp<DataSource> &,
-            const char *, sp<AMessage> *) {
+            const char *, const sp<AMessage> &) {
     return ext;
 }
 
diff --git a/media/libstagefright/MediaExtractor.cpp b/media/libstagefright/MediaExtractor.cpp
index c0fbb6d..0f656a1 100644
--- a/media/libstagefright/MediaExtractor.cpp
+++ b/media/libstagefright/MediaExtractor.cpp
@@ -94,7 +94,7 @@ sp<MediaExtractor> MediaExtractor::Create(
     }
 
     sp<MediaExtractor> ret = NULL;
-    if ((ret = AVFactory::get()->createExtendedExtractor(source, mime, &meta)) != NULL) {
+    if ((ret = AVFactory::get()->createExtendedExtractor(source, mime, meta)) != NULL) {
     } else if (!strcasecmp(mime, MEDIA_MIMETYPE_CONTAINER_MPEG4)
             || !strcasecmp(mime, "audio/mp4")) {
         ret = new MPEG4Extractor(source);
@@ -124,7 +124,7 @@ sp<MediaExtractor> MediaExtractor::Create(
         ret = new MidiExtractor(source);
     }
 
-    ret = AVFactory::get()->updateExtractor(ret, source, mime, &meta);
+    ret = AVFactory::get()->updateExtractor(ret, source, mime, meta);
     if (ret != NULL) {
        if (isDrm) {
            ret->setDrmFlag(true);