Backed out changeset e3864c540bed (bug 1159495) for breaking Nexus Builds

This commit is contained in:
Carsten "Tomcat" Book 2015-04-29 16:41:54 +02:00
Родитель 30e97ddfc3
Коммит 86a8802d0a
1 изменённых файлов: 0 добавлений и 6 удалений

Просмотреть файл

@ -13,7 +13,6 @@
#endif #endif
#ifdef XP_WIN #ifdef XP_WIN
#include "mozilla/WindowsVersion.h" #include "mozilla/WindowsVersion.h"
#include "WMFDecoderModule.h"
#endif #endif
#include "nsContentCID.h" #include "nsContentCID.h"
#include "nsServiceManagerUtils.h" #include "nsServiceManagerUtils.h"
@ -160,11 +159,6 @@ MediaKeySystemAccess::GetKeySystemStatus(const nsAString& aKeySystem,
if (!Preferences::GetBool("media.gmp-eme-adobe.enabled", false)) { if (!Preferences::GetBool("media.gmp-eme-adobe.enabled", false)) {
return MediaKeySystemStatus::Cdm_disabled; return MediaKeySystemStatus::Cdm_disabled;
} }
if (!WMFDecoderModule::HasH264() || !WMFDecoderModule::HasAAC()) {
// The system doesn't have the codecs that Adobe EME relies
// on installed.
return MediaKeySystemStatus::Cdm_not_supported;
}
return EnsureMinCDMVersion(mps, aKeySystem, aMinCdmVersion, true); return EnsureMinCDMVersion(mps, aKeySystem, aMinCdmVersion, true);
} }
#endif #endif