85ee873b2b
Essentially a no-op since we're going to see this change reverted when we vendor in 995688c8e8. Upstream commit: https://webrtc.googlesource.com/src/+/f30c044cf9bd06f91017c171d98690094ce6d88b more p2p cleanups Move test code from p2p/base and rtc_base/ into p2p/test/ This p2p/base much less crowded and clarifies that the rtc_base/nat* is in fact only test code. BUG=webrtc:0 Change-Id: I4d14fae24cb0eff6783962f4b4483b560367ca5d Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/378900 Commit-Queue: Jonas Oreland <jonaso@webrtc.org> Reviewed-by: Harald Alvestrand <hta@webrtc.org> Auto-Submit: Jonas Oreland <jonaso@webrtc.org> Cr-Commit-Position: refs/heads/main@{#43995} Differential Revision: https://phabricator.services.mozilla.com/D244003
28 lines
1.0 KiB
Diff
28 lines
1.0 KiB
Diff
From: Dan Minor <dminor@mozilla.com>
|
|
Date: Tue, 1 Dec 2020 09:36:00 -0500
|
|
Subject: Bug 1654112 - Disable creating av1 encoder and decoder. r=ng
|
|
|
|
Differential Revision: https://phabricator.services.mozilla.com/D130089
|
|
Mercurial Revision: https://hg.mozilla.org/mozilla-central/rev/ef548d7758c7de6e78d38af299c2296bf9d20ec9
|
|
---
|
|
media/engine/internal_decoder_factory.cc | 2 ++
|
|
1 file changed, 2 insertions(+)
|
|
|
|
diff --git a/media/engine/internal_decoder_factory.cc b/media/engine/internal_decoder_factory.cc
|
|
index 33fed924df..5b91209aba 100644
|
|
--- a/media/engine/internal_decoder_factory.cc
|
|
+++ b/media/engine/internal_decoder_factory.cc
|
|
@@ -50,10 +50,12 @@ std::vector<SdpVideoFormat> InternalDecoderFactory::GetSupportedFormats()
|
|
for (const SdpVideoFormat& h264_format : SupportedH264DecoderCodecs())
|
|
formats.push_back(h264_format);
|
|
|
|
+#if !defined(WEBRTC_MOZILLA_BUILD)
|
|
if (kDav1dIsIncluded) {
|
|
formats.push_back(SdpVideoFormat::AV1Profile0());
|
|
formats.push_back(SdpVideoFormat::AV1Profile1());
|
|
}
|
|
+#endif
|
|
|
|
return formats;
|
|
}
|