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/MediaExtractor.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/MediaExtractor.cpp')
| -rw-r--r-- | media/libstagefright/MediaExtractor.cpp | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/media/libstagefright/MediaExtractor.cpp b/media/libstagefright/MediaExtractor.cpp index 9eee6aa..374ecf7 100644 --- a/media/libstagefright/MediaExtractor.cpp +++ b/media/libstagefright/MediaExtractor.cpp @@ -111,9 +111,6 @@ sp<MediaExtractor> MediaExtractor::Create( ret = new MPEG2TSExtractor(source); } else if (!strcasecmp(mime, MEDIA_MIMETYPE_CONTAINER_WVM)) { ret = new WVMExtractor(source); - if (ret != NULL) { - isDrm = true; - } } else if (!strcasecmp(mime, MEDIA_MIMETYPE_AUDIO_AAC_ADTS)) { ret = new AACExtractor(source); } else if (!strcasecmp(mime, MEDIA_MIMETYPE_CONTAINER_MPEG2PS)) { |