diff options
| author | James Dong <jdong@google.com> | 2011-12-14 13:53:31 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-12-14 13:53:31 -0800 |
| commit | 2a3d6e1b6cfd2d564a48371598fdc664ea40fa8c (patch) | |
| tree | a1031e278f98ee35c02b14f322e4f1f0c60ae9e1 /media/libstagefright/include | |
| parent | 5805f995ef365bf00fcccd5c1f948086c17ec75e (diff) | |
| parent | 26c2a6bf34b370d467cab4753e5a4b187ba62c0f (diff) | |
| download | frameworks_av-2a3d6e1b6cfd2d564a48371598fdc664ea40fa8c.zip frameworks_av-2a3d6e1b6cfd2d564a48371598fdc664ea40fa8c.tar.gz frameworks_av-2a3d6e1b6cfd2d564a48371598fdc664ea40fa8c.tar.bz2 | |
am 3f6a7d1e: 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 '3f6a7d1ee961a4544563932b7499535dc1cac1ec':
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/include')
| -rw-r--r-- | media/libstagefright/include/WVMExtractor.h | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/media/libstagefright/include/WVMExtractor.h b/media/libstagefright/include/WVMExtractor.h index 9f763f9..deecd25 100644 --- a/media/libstagefright/include/WVMExtractor.h +++ b/media/libstagefright/include/WVMExtractor.h @@ -23,8 +23,6 @@ namespace android { -struct AMessage; -class String8; class DataSource; class WVMLoadableExtractor : public MediaExtractor { @@ -60,8 +58,6 @@ public: // is used. void setAdaptiveStreamingMode(bool adaptive); - static bool getVendorLibHandle(); - protected: virtual ~WVMExtractor(); @@ -73,10 +69,6 @@ private: WVMExtractor &operator=(const WVMExtractor &); }; -bool SniffWVM( - const sp<DataSource> &source, String8 *mimeType, float *confidence, - sp<AMessage> *); - } // namespace android #endif // DRM_EXTRACTOR_H_ |