Bug 1132789 - Mac ClearKey EME work on MacOSX. r=spohl
authorChris Pearce <chris@pearce.org.nz>
Fri, 13 Feb 2015 21:30:23 +1300
changeset 228928 c81728bfda79529ea31c42a6e7467b854e9baddf
parent 228927 109c66867717f8b861cf6cb3f51e1894be431e60
child 228929 a7c6bec02690ab181c1968aabe7f920aa6ceeccf
push id28274
push usercbook@mozilla.com
push dateFri, 13 Feb 2015 16:03:46 +0000
treeherdermozilla-central@8f9d3dabd12e [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersspohl
bugs1132789
milestone38.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1132789 - Mac ClearKey EME work on MacOSX. r=spohl
toolkit/mozapps/extensions/internal/OpenH264Provider.jsm
--- a/toolkit/mozapps/extensions/internal/OpenH264Provider.jsm
+++ b/toolkit/mozapps/extensions/internal/OpenH264Provider.jsm
@@ -22,17 +22,17 @@ XPCOMUtils.defineLazyModuleGetter(this, 
                                   "resource://gre/modules/GMPInstallManager.jsm");
 
 const URI_EXTENSION_STRINGS    = "chrome://mozapps/locale/extensions/extensions.properties";
 const STRING_TYPE_NAME         = "type.%ID%.name";
 
 const SEC_IN_A_DAY              = 24 * 60 * 60;
 
 const EME_PREF_ENABLED         = "media.eme.enabled";
-const NS_GRE_BIN_DIR           = "GreBinD";
+const NS_GRE_BIN_DIR           = "GreD";
 const CLEARKEY_PLUGIN_ID       = "gmp-clearkey";
 const CLEARKEY_VERSION         = "0.1";
 
 const OPENH264_PLUGIN_ID       = "gmp-gmpopenh264";
 const OPENH264_PREF_BRANCH     = "media." + OPENH264_PLUGIN_ID + ".";
 const OPENH264_PREF_ENABLED    = "enabled";
 const OPENH264_PREF_VERSION    = "version";
 const OPENH264_PREF_LASTUPDATE = "lastUpdate";