summaryrefslogtreecommitdiffstats
path: root/dom/media/webm
diff options
context:
space:
mode:
authortrav90 <travawine@palemoon.org>2018-10-20 08:24:28 -0500
committertrav90 <travawine@palemoon.org>2018-10-20 08:24:28 -0500
commit6ddf66542bfbc90056ca86023da7bdefcec31aa8 (patch)
tree4025c6a417a5dee99ceafb8b4aa6e9863dfa24f6 /dom/media/webm
parentd2499ead93dc4298c0882fe98902acb1b5209f99 (diff)
downloadUXP-6ddf66542bfbc90056ca86023da7bdefcec31aa8.tar
UXP-6ddf66542bfbc90056ca86023da7bdefcec31aa8.tar.gz
UXP-6ddf66542bfbc90056ca86023da7bdefcec31aa8.tar.lz
UXP-6ddf66542bfbc90056ca86023da7bdefcec31aa8.tar.xz
UXP-6ddf66542bfbc90056ca86023da7bdefcec31aa8.zip
Put AV1 codec behind a pref
Disabled by default.
Diffstat (limited to 'dom/media/webm')
-rw-r--r--dom/media/webm/WebMDecoder.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/dom/media/webm/WebMDecoder.cpp b/dom/media/webm/WebMDecoder.cpp
index 32feda6c0..5a32793ac 100644
--- a/dom/media/webm/WebMDecoder.cpp
+++ b/dom/media/webm/WebMDecoder.cpp
@@ -8,6 +8,7 @@
#ifdef MOZ_AV1
#include "AOMDecoder.h"
#endif
+#include "MediaPrefs.h"
#include "MediaDecoderStateMachine.h"
#include "WebMDemuxer.h"
#include "WebMDecoder.h"
@@ -69,7 +70,8 @@ WebMDecoder::CanHandleMediaType(const nsACString& aMIMETypeExcludingCodecs,
continue;
}
#ifdef MOZ_AV1
- if (isWebMVideo && AOMDecoder::IsSupportedCodec(codec)) {
+ if (isWebMVideo && MediaPrefs::AV1Enabled() &&
+ AOMDecoder::IsSupportedCodec(codec)) {
continue;
}
#endif