summaryrefslogtreecommitdiffstats
path: root/media
diff options
context:
space:
mode:
authorMathias Agopian <mathias@google.com>2011-02-23 15:23:13 -0800
committerAndroid (Google) Code Review <android-gerrit@google.com>2011-02-23 15:23:13 -0800
commit7f97c4ef12263a70a5c9ee7cd16f194c0240e658 (patch)
treeb0ca0631106dac07c5a9aa0423f4b1cc9652fe87 /media
parent17f49e4f91c04290721dc029b73b9a430f5298d5 (diff)
parenta688b574d294faae5f56224908b40856c5045aac (diff)
downloadframeworks_base-7f97c4ef12263a70a5c9ee7cd16f194c0240e658.zip
frameworks_base-7f97c4ef12263a70a5c9ee7cd16f194c0240e658.tar.gz
frameworks_base-7f97c4ef12263a70a5c9ee7cd16f194c0240e658.tar.bz2
Merge "Remove RefBase.h dependency on TextOutput.h"
Diffstat (limited to 'media')
-rw-r--r--media/libstagefright/include/AMRExtractor.h1
-rw-r--r--media/libstagefright/include/MP3Extractor.h1
-rw-r--r--media/libstagefright/include/OggExtractor.h1
-rw-r--r--media/libstagefright/include/WAVExtractor.h1
-rw-r--r--media/libstagefright/include/avc_utils.h1
-rw-r--r--media/libstagefright/mpeg2ts/ESQueue.h1
6 files changed, 6 insertions, 0 deletions
diff --git a/media/libstagefright/include/AMRExtractor.h b/media/libstagefright/include/AMRExtractor.h
index 589d837..4a1c827 100644
--- a/media/libstagefright/include/AMRExtractor.h
+++ b/media/libstagefright/include/AMRExtractor.h
@@ -18,6 +18,7 @@
#define AMR_EXTRACTOR_H_
+#include <utils/Errors.h>
#include <media/stagefright/MediaExtractor.h>
namespace android {
diff --git a/media/libstagefright/include/MP3Extractor.h b/media/libstagefright/include/MP3Extractor.h
index 728980e..ef71b8f 100644
--- a/media/libstagefright/include/MP3Extractor.h
+++ b/media/libstagefright/include/MP3Extractor.h
@@ -18,6 +18,7 @@
#define MP3_EXTRACTOR_H_
+#include <utils/Errors.h>
#include <media/stagefright/MediaExtractor.h>
namespace android {
diff --git a/media/libstagefright/include/OggExtractor.h b/media/libstagefright/include/OggExtractor.h
index a41f681..e97c8cd 100644
--- a/media/libstagefright/include/OggExtractor.h
+++ b/media/libstagefright/include/OggExtractor.h
@@ -18,6 +18,7 @@
#define OGG_EXTRACTOR_H_
+#include <utils/Errors.h>
#include <media/stagefright/MediaExtractor.h>
namespace android {
diff --git a/media/libstagefright/include/WAVExtractor.h b/media/libstagefright/include/WAVExtractor.h
index 9de197f..ce1f33a 100644
--- a/media/libstagefright/include/WAVExtractor.h
+++ b/media/libstagefright/include/WAVExtractor.h
@@ -18,6 +18,7 @@
#define WAV_EXTRACTOR_H_
+#include <utils/Errors.h>
#include <media/stagefright/MediaExtractor.h>
namespace android {
diff --git a/media/libstagefright/include/avc_utils.h b/media/libstagefright/include/avc_utils.h
index 0218755..afff824 100644
--- a/media/libstagefright/include/avc_utils.h
+++ b/media/libstagefright/include/avc_utils.h
@@ -19,6 +19,7 @@
#define AVC_UTILS_H_
#include <media/stagefright/foundation/ABuffer.h>
+#include <utils/Errors.h>
namespace android {
diff --git a/media/libstagefright/mpeg2ts/ESQueue.h b/media/libstagefright/mpeg2ts/ESQueue.h
index d081995..153cfe6 100644
--- a/media/libstagefright/mpeg2ts/ESQueue.h
+++ b/media/libstagefright/mpeg2ts/ESQueue.h
@@ -19,6 +19,7 @@
#define ES_QUEUE_H_
#include <media/stagefright/foundation/ABase.h>
+#include <utils/Errors.h>
#include <utils/List.h>
#include <utils/RefBase.h>