commit fe04d2c1de1cdf0b0e9919575829cfaab46450e8
author Lajos Molnar <lajos@google.com> Wed Feb 10 07:40:01 2016 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Feb 10 07:40:01 2016 +0000
tree 3f35057450b16a97f1f08b36227c6e512935bfc1
parent 13cfd8250f6d602d65d5ce4425d779c3154215aa
parent 07939a193c0f94a8684cbc06e87d401746d1f1bc

Merge "remove OMXCodec.h dependency"

src/android/android_AudioSfDecoder.cpp

diff --git a/src/android/android_AudioSfDecoder.cpp b/src/android/android_AudioSfDecoder.cpp
index d3d9e67..3bced60 100644
--- a/src/android/android_AudioSfDecoder.cpp
+++ b/src/android/android_AudioSfDecoder.cpp
@@ -23,6 +23,7 @@
 #include <binder/IServiceManager.h>
 #include <media/IMediaHTTPService.h>
 #include <media/stagefright/foundation/ADebug.h>
+#include <media/stagefright/MediaBuffer.h>
 #include <media/stagefright/SimpleDecodingSource.h>
 
 

src/android/android_AudioSfDecoder.h

diff --git a/src/android/android_AudioSfDecoder.h b/src/android/android_AudioSfDecoder.h
index ae8e7f6..66ddb67 100644
--- a/src/android/android_AudioSfDecoder.h
+++ b/src/android/android_AudioSfDecoder.h
@@ -23,8 +23,6 @@
 #include <media/stagefright/MediaDefs.h>
 #include <media/stagefright/MediaExtractor.h>
 #include <media/stagefright/MetaData.h>
-#include <media/stagefright/OMXClient.h>
-#include <media/stagefright/OMXCodec.h>
 #include "NuCachedSource2.h"
 #include "ThrottledSource.h"
 

src/android/android_AudioToCbRenderer.cpp

diff --git a/src/android/android_AudioToCbRenderer.cpp b/src/android/android_AudioToCbRenderer.cpp
index f008ddb..970543c 100644
--- a/src/android/android_AudioToCbRenderer.cpp
+++ b/src/android/android_AudioToCbRenderer.cpp
@@ -20,6 +20,7 @@
 #include "android/android_AudioToCbRenderer.h"
 
 #include <media/stagefright/foundation/ADebug.h>
+#include <media/stagefright/MediaBuffer.h>
 
 namespace android {