From df394801a2bebba622489dc120da93728c594931 Mon Sep 17 00:00:00 2001 From: Edwin Flores Date: Thu, 20 Nov 2014 11:17:47 +1300 Subject: [PATCH] Bug 1100164 - Fix gmp-clearkey path - r=unfocused --- toolkit/mozapps/extensions/internal/OpenH264Provider.jsm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/toolkit/mozapps/extensions/internal/OpenH264Provider.jsm b/toolkit/mozapps/extensions/internal/OpenH264Provider.jsm index b102ef1a1de7..85d9387c8e9e 100644 --- a/toolkit/mozapps/extensions/internal/OpenH264Provider.jsm +++ b/toolkit/mozapps/extensions/internal/OpenH264Provider.jsm @@ -27,6 +27,7 @@ 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 CLEARKEY_PLUGIN_ID = "gmp-clearkey"; const CLEARKEY_VERSION = "0.1"; @@ -283,7 +284,8 @@ let OpenH264Provider = { if (Preferences.get(EME_PREF_ENABLED, false)) { try { - gmpService.addPluginDirectory(OS.Path.join(OS.Constants.Path.libDir, + let greBinDir = Services.dirsvc.get(NS_GRE_BIN_DIR, Ci.nsILocalFile); + gmpService.addPluginDirectory(OS.Path.join(greBinDir.path, CLEARKEY_PLUGIN_ID, CLEARKEY_VERSION)); } catch (e) {