commit a70beb16195266900997f2f376d2f28017cd45a4
author Marco Nelissen <marcone@google.com> Tue Jul 17 14:10:03 2018 -0700
committer Marco Nelissen <marcone@google.com> Thu Aug 23 08:10:30 2018 -0700
tree ba0716f8eb0e1210e663bd48242c2b56deeee401
parent 9985754cabf9d426bf95e3adfc27cea7fcc86e42

Move MediaExtractor back to libstagefright

It is no longer needed in libmediaextractor, and moving it back
to libstagefright will avoid a circular dependency later.

Bug: 111407253
Test: build, boot, play some files

Change-Id: I1373a9eedee27998e7733ea23ae1a375e45cc9c3

media/libmediaplayerservice/nuplayer/GenericSource.cpp

diff --git a/media/libmediaplayerservice/nuplayer/GenericSource.cpp b/media/libmediaplayerservice/nuplayer/GenericSource.cpp
index 23d66bb..8cd6eda 100644
--- a/media/libmediaplayerservice/nuplayer/GenericSource.cpp
+++ b/media/libmediaplayerservice/nuplayer/GenericSource.cpp
@@ -25,7 +25,6 @@
 #include <cutils/properties.h>
 #include <media/DataSource.h>
 #include <media/MediaBufferHolder.h>
-#include <media/MediaExtractor.h>
 #include <media/MediaSource.h>
 #include <media/IMediaExtractorService.h>
 #include <media/IMediaHTTPService.h>
@@ -38,6 +37,7 @@
 #include <media/stagefright/MediaBuffer.h>
 #include <media/stagefright/MediaClock.h>
 #include <media/stagefright/MediaDefs.h>
+#include <media/stagefright/MediaExtractor.h>
 #include <media/stagefright/MediaExtractorFactory.h>
 #include <media/stagefright/MetaData.h>
 #include <media/stagefright/Utils.h>