diff options
| author | Edwin Wong <edwinwong@google.com> | 2011-07-01 08:52:28 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-07-01 08:52:28 -0700 |
| commit | 3edf4509ad62582c682cbcf572396da4036506a3 (patch) | |
| tree | 49c4c45e819eaa0a470940cff076e20b0916d69c /media/libstagefright/include | |
| parent | ab23dc0443e874a82110119896cce0103d89a529 (diff) | |
| parent | e301545a292987b6f7f3b316003eb8b76e3a5e2e (diff) | |
| download | frameworks_av-3edf4509ad62582c682cbcf572396da4036506a3.zip frameworks_av-3edf4509ad62582c682cbcf572396da4036506a3.tar.gz frameworks_av-3edf4509ad62582c682cbcf572396da4036506a3.tar.bz2 | |
Merge "Revert "Fix for b/4165024: Serious Memory leak when playing a WV protected streaming video.""
Diffstat (limited to 'media/libstagefright/include')
| -rw-r--r-- | media/libstagefright/include/WVMExtractor.h | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/media/libstagefright/include/WVMExtractor.h b/media/libstagefright/include/WVMExtractor.h index 0817bab..deecd25 100644 --- a/media/libstagefright/include/WVMExtractor.h +++ b/media/libstagefright/include/WVMExtractor.h @@ -18,7 +18,6 @@ #define WVM_EXTRACTOR_H_ -#include <media/stagefright/DataSource.h> #include <media/stagefright/MediaExtractor.h> #include <utils/Errors.h> @@ -68,10 +67,6 @@ private: WVMExtractor(const WVMExtractor &); WVMExtractor &operator=(const WVMExtractor &); - - static Mutex sMutex; - static uint32_t sActiveExtractors; - static void *sVendorLibHandle; }; } // namespace android |