diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2021-01-22 10:55:57 +0100 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2021-01-25 15:41:53 +0100 |
| commit | cde72003881c6b5680ac8ac0fe6d6971bb43e0d5 (patch) | |
| tree | fcb50002765c1cb179dd6f62054380c3fed85e80 /src/core/content_client_qt.cpp | |
| parent | 3fb215dab139fd7b61473ce3fe1058b87a6b4fe3 (diff) | |
| parent | 75d061bbc68875c08b3dc243e464e32a80da71df (diff) | |
Merge remote-tracking branch 'origin/5.15' into dev
Including update to 87-based
Change-Id: I36b6054e00de97ab055d0bc800cff08d0408fac6
Diffstat (limited to 'src/core/content_client_qt.cpp')
| -rw-r--r-- | src/core/content_client_qt.cpp | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/core/content_client_qt.cpp b/src/core/content_client_qt.cpp index 647d45819..d74e7eb76 100644 --- a/src/core/content_client_qt.cpp +++ b/src/core/content_client_qt.cpp @@ -54,7 +54,7 @@ #include "ui/base/layout.h" #include "ui/base/l10n/l10n_util.h" #include "ui/base/resource/resource_bundle.h" -#include "services/service_manager/embedder/switches.h" +#include "services/service_manager/switches.h" #include "type_conversion.h" #include <QCoreApplication> @@ -71,7 +71,7 @@ // File name of the CDM on different platforms. const char kWidevineCdmFileName[] = -#if defined(OS_MACOSX) +#if defined(OS_MAC) "widevinecdm.plugin"; #elif defined(OS_WIN) "widevinecdm.dll"; @@ -422,8 +422,7 @@ void ContentClientQt::AddContentDecryptionModules(std::vector<content::CdmInfo> content::CdmCapability capability( {}, {media::EncryptionScheme::kCenc, media::EncryptionScheme::kCbcs}, {media::CdmSessionType::kTemporary, - media::CdmSessionType::kPersistentLicense}, - {}); + media::CdmSessionType::kPersistentLicense}); // Register kExternalClearKeyDifferentGuidTestKeySystem first separately. // Otherwise, it'll be treated as a sub-key-system of normal |