diff options
| author | wolfbeast <mcwerewolf@wolfbeast.com> | 2020-01-11 22:41:59 +0100 |
|---|---|---|
| committer | wolfbeast <mcwerewolf@wolfbeast.com> | 2020-01-11 22:41:59 +0100 |
| commit | 329d35ab57451a668331667221eef7352ef04ef6 (patch) | |
| tree | e9cfdb38aa59f09c46df71a856de6ade171f380e /dom/media/platforms | |
| parent | d0da27ef572152d1fdd82a9ac15bd5c23ad68160 (diff) | |
| parent | cffb44547ae7997e5eaf71c644bd626eeb3bba00 (diff) | |
| download | UXP-2020.01.12.tar UXP-2020.01.12.tar.gz UXP-2020.01.12.tar.lz UXP-2020.01.12.tar.xz UXP-2020.01.12.zip | |
Merge branch 'release' into Basilisk-releasev2020.01.12
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; } } |