diff options
| author | Matt A. Tobin <email@mattatobin.com> | 2019-11-10 15:43:51 -0500 |
|---|---|---|
| committer | Matt A. Tobin <email@mattatobin.com> | 2019-11-10 15:43:51 -0500 |
| commit | b0e23e79e72b7892b826fabea4f9e02c421d2861 (patch) | |
| tree | 26f20aea660514c213a3ae942eab222e5ccebde3 /dom/media/platforms | |
| parent | 03590a6711d601ef3ddb48787e9f3f556705b5db (diff) | |
| parent | b00601953bade944cd6df9cde6fcdd1f10d76feb (diff) | |
| download | UXP-b0e23e79e72b7892b826fabea4f9e02c421d2861.tar UXP-b0e23e79e72b7892b826fabea4f9e02c421d2861.tar.gz UXP-b0e23e79e72b7892b826fabea4f9e02c421d2861.tar.lz UXP-b0e23e79e72b7892b826fabea4f9e02c421d2861.tar.xz UXP-b0e23e79e72b7892b826fabea4f9e02c421d2861.zip | |
Merge branch 'master' into mailnews-work
Diffstat (limited to 'dom/media/platforms')
| -rw-r--r-- | dom/media/platforms/agnostic/gmp/GMPDecoderModule.cpp | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/dom/media/platforms/agnostic/gmp/GMPDecoderModule.cpp b/dom/media/platforms/agnostic/gmp/GMPDecoderModule.cpp index cc53d2c93..50a5097ac 100644 --- a/dom/media/platforms/agnostic/gmp/GMPDecoderModule.cpp +++ b/dom/media/platforms/agnostic/gmp/GMPDecoderModule.cpp @@ -109,7 +109,6 @@ GMPDecoderModule::PreferredGMP(const nsACString& aMimeType) if (aMimeType.EqualsLiteral("audio/mp4a-latm")) { switch (MediaPrefs::GMPAACPreferred()) { case 1: rv.emplace(kEMEKeySystemClearkey); break; - case 2: rv.emplace(kEMEKeySystemPrimetime); break; default: break; } } @@ -117,7 +116,6 @@ GMPDecoderModule::PreferredGMP(const nsACString& aMimeType) if (MP4Decoder::IsH264(aMimeType)) { switch (MediaPrefs::GMPH264Preferred()) { case 1: rv.emplace(kEMEKeySystemClearkey); break; - case 2: rv.emplace(kEMEKeySystemPrimetime); break; default: break; } } |