summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAllan Sandfeld Jensen <allan.jensen@qt.io>2018-05-17 11:04:26 +0200
committerAllan Sandfeld Jensen <allan.jensen@qt.io>2018-05-17 09:31:11 +0000
commitbd3687d2c5cc78e7571406471689b2d0fafbb1bf (patch)
tree9356bbd28b62a48236f753f2bad424d2814bc609
parentbab4ababd097fd90b227a5a1bca63343b97af091 (diff)
Only add the first found widevine CDM
Otherwise Chromium will pick the last added, meaning we will use the wrong one. Task-number: QTBUG-64071 Change-Id: Id5c939b6a5c70643ed047625c0cbb152dd8c7169 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
m---------src/3rdparty0
-rw-r--r--src/core/content_client_qt.cpp1
2 files changed, 1 insertions, 0 deletions
diff --git a/src/3rdparty b/src/3rdparty
-Subproject 1785e2c1eb5a3b9a9a97ef3125c8f444d9b62af
+Subproject de120c712b755a45687b4f3a7fd01bb7d334669
diff --git a/src/core/content_client_qt.cpp b/src/core/content_client_qt.cpp
index c1683bfa0..37b601bf8 100644
--- a/src/core/content_client_qt.cpp
+++ b/src/core/content_client_qt.cpp
@@ -276,6 +276,7 @@ void AddPepperWidevine(std::vector<content::PepperPluginInfo>* plugins)
widevine_cdm.mime_types.push_back(widevine_cdm_mime_type);
widevine_cdm.permissions = kWidevineCdmPluginPermissions;
plugins->push_back(widevine_cdm);
+ break;
}
}
#endif // defined(WIDEVINE_CDM_AVAILABLE) && BUILDFLAG(ENABLE_PEPPER_CDMS) &&