diff options
| author | Andreas Huber <andih@google.com> | 2010-03-12 09:39:33 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-03-12 09:39:33 -0800 |
| commit | c116510dd22091369ab15b63fbbc176e1fb39a04 (patch) | |
| tree | 861e8fb2510a2bf629d9b6106377d18f71c3e608 /media/libstagefright/StagefrightMetadataRetriever.cpp | |
| parent | 8a6e24135608d1ec6629f381acd20d88369cd940 (diff) | |
| parent | e94bd14078d327ef2f800e69907efce641a13272 (diff) | |
| download | frameworks_av-c116510dd22091369ab15b63fbbc176e1fb39a04.zip frameworks_av-c116510dd22091369ab15b63fbbc176e1fb39a04.tar.gz frameworks_av-c116510dd22091369ab15b63fbbc176e1fb39a04.tar.bz2 | |
Merge "HTTPStream and HTTPDataSource now support cancellation of the connection process, AwesomePlayer takes advantage of this in cases where ::reset() or ::suspend() is called while in the preparation phase to bail out early. Also fixes in issue where the audio codec was not properly stopped if no audio player object ever took ownership."
Diffstat (limited to 'media/libstagefright/StagefrightMetadataRetriever.cpp')
| -rw-r--r-- | media/libstagefright/StagefrightMetadataRetriever.cpp | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/media/libstagefright/StagefrightMetadataRetriever.cpp b/media/libstagefright/StagefrightMetadataRetriever.cpp index c0cf97c..4679207 100644 --- a/media/libstagefright/StagefrightMetadataRetriever.cpp +++ b/media/libstagefright/StagefrightMetadataRetriever.cpp @@ -23,7 +23,6 @@ #include <media/stagefright/ColorConverter.h> #include <media/stagefright/DataSource.h> #include <media/stagefright/FileSource.h> -#include <media/stagefright/HTTPDataSource.h> #include <media/stagefright/MediaDebug.h> #include <media/stagefright/MediaExtractor.h> #include <media/stagefright/MetaData.h> |