diff options
| author | James Dong <jdong@google.com> | 2011-12-14 13:50:08 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-12-14 13:50:08 -0800 |
| commit | 26c2a6bf34b370d467cab4753e5a4b187ba62c0f (patch) | |
| tree | 52cb291bf974f4593277cc1142e514ebadae4b89 /media/libstagefright/DataSource.cpp | |
| parent | 50845c903200fbf5e1e61012376516931e945e4c (diff) | |
| parent | 785ee06d106cd7958e0c151ebc6b7174d9ba861e (diff) | |
| download | frameworks_av-26c2a6bf34b370d467cab4753e5a4b187ba62c0f.zip frameworks_av-26c2a6bf34b370d467cab4753e5a4b187ba62c0f.tar.gz frameworks_av-26c2a6bf34b370d467cab4753e5a4b187ba62c0f.tar.bz2 | |
am d70c64db: Revert the following patches because they may lead to power regression because SHA/MD5 module is stuck 1. Revert "Fix drm flag setting missed in false drm recognition fix." This reverts commit 9f704f6c46a171357e49c411c83458b9d4565f3b.
* commit 'd70c64db9f67dbe8f888de6b1bdcc835226ec526':
Revert the following patches because they may lead to power regression because SHA/MD5 module is stuck 1. Revert "Fix drm flag setting missed in false drm recognition fix." This reverts commit 9f704f6c46a171357e49c411c83458b9d4565f3b.
Diffstat (limited to 'media/libstagefright/DataSource.cpp')
| -rw-r--r-- | media/libstagefright/DataSource.cpp | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/media/libstagefright/DataSource.cpp b/media/libstagefright/DataSource.cpp index 6134344..43539bb 100644 --- a/media/libstagefright/DataSource.cpp +++ b/media/libstagefright/DataSource.cpp @@ -26,7 +26,6 @@ #include "include/DRMExtractor.h" #include "include/FLACExtractor.h" #include "include/AACExtractor.h" -#include "include/WVMExtractor.h" #include "matroska/MatroskaExtractor.h" @@ -114,7 +113,6 @@ void DataSource::RegisterDefaultSniffers() { RegisterSniffer(SniffMP3); RegisterSniffer(SniffAAC); RegisterSniffer(SniffMPEG2PS); - RegisterSniffer(SniffWVM); char value[PROPERTY_VALUE_MAX]; if (property_get("drm.service.enabled", value, NULL) |