diff options
| author | Moonchild <mcwerewolf@wolfbeast.com> | 2018-12-16 19:29:23 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-12-16 19:29:23 +0100 |
| commit | 7457ca4ac175812fec0f8729689cc2e8746204d7 (patch) | |
| tree | ca3862ac06a9299917d3a63a698509c18b58723c /dom/media/MediaDecoder.cpp | |
| parent | ff8b573a67d9fad769c4461b97d5bf693468dc5b (diff) | |
| parent | 5104ad6acf44ce222ba1c90f7db871facd790528 (diff) | |
| download | UXP-7457ca4ac175812fec0f8729689cc2e8746204d7.tar UXP-7457ca4ac175812fec0f8729689cc2e8746204d7.tar.gz UXP-7457ca4ac175812fec0f8729689cc2e8746204d7.tar.lz UXP-7457ca4ac175812fec0f8729689cc2e8746204d7.tar.xz UXP-7457ca4ac175812fec0f8729689cc2e8746204d7.zip | |
Merge pull request #911 from trav90/code-cleanup
Remove AndroidMediaDecoder
Diffstat (limited to 'dom/media/MediaDecoder.cpp')
| -rw-r--r-- | dom/media/MediaDecoder.cpp | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/dom/media/MediaDecoder.cpp b/dom/media/MediaDecoder.cpp index d027818de..cf2266bf6 100644 --- a/dom/media/MediaDecoder.cpp +++ b/dom/media/MediaDecoder.cpp @@ -35,10 +35,6 @@ #include "Layers.h" #include "mozilla/layers/ShadowLayers.h" -#ifdef MOZ_ANDROID_OMX -#include "AndroidBridge.h" -#endif - using namespace mozilla::dom; using namespace mozilla::layers; using namespace mozilla::media; @@ -1617,16 +1613,6 @@ MediaDecoder::IsWebMEnabled() return Preferences::GetBool("media.webm.enabled"); } -#ifdef MOZ_ANDROID_OMX -bool -MediaDecoder::IsAndroidMediaPluginEnabled() -{ - return AndroidBridge::Bridge() && - AndroidBridge::Bridge()->GetAPIVersion() < 16 && - Preferences::GetBool("media.plugins.enabled"); -} -#endif - NS_IMETHODIMP MediaMemoryTracker::CollectReports(nsIHandleReportCallback* aHandleReport, nsISupports* aData, bool aAnonymize) |