mozilla-central: changeset 496785:7b70cc3ab4ed5c71af4c5de1efcdc7e5f2b2f6ab

author	John Lin <jolin@mozilla.com>
	Tue, 08 Oct 2019 17:15:15 +0000
changeset 496785	7b70cc3ab4ed5c71af4c5de1efcdc7e5f2b2f6ab
parent 496784	fe4675749b699118cf258e0b6456141fafb322dc
child 496786	5530f741f9ad3a10fe395f9b5d2c8e820414e462
push id	36668
push user	aiakab@mozilla.com
push date	Wed, 09 Oct 2019 04:06:09 +0000
treeherder	mozilla-central@26ebfec08834 [default view] [failures only]
perfherder	[talos] [build metrics] [platform microbench] (compared to previous push)
reviewers	jya
bugs	1581902
milestone	71.0a1
first release with	nightly linux32 be9a6289486a / 71.0a1 / 20191009095806 / files nightly linux64 be9a6289486a / 71.0a1 / 20191009095806 / files nightly mac be9a6289486a / 71.0a1 / 20191009095806 / files nightly win32 be9a6289486a / 71.0a1 / 20191009095806 / files nightly win64 be9a6289486a / 71.0a1 / 20191009095806 / files
last release without	nightly linux32 e1a65223d498 / 71.0a1 / 20191008214557 / files nightly linux64 e1a65223d498 / 71.0a1 / 20191008214557 / files nightly mac e1a65223d498 / 71.0a1 / 20191008214557 / files nightly win32 e1a65223d498 / 71.0a1 / 20191008214557 / files nightly win64 e1a65223d498 / 71.0a1 / 20191008214557 / files

--- a/media/webrtc/signaling/src/media-conduit/MediaDataCodec.cpp
+++ b/media/webrtc/signaling/src/media-conduit/MediaDataCodec.cpp
@@ -8,17 +8,17 @@
 #include "WebrtcGmpVideoCodec.h"
 #include "mozilla/StaticPrefs_media.h"
 
 namespace mozilla {
 
 /* static */
 WebrtcVideoEncoder* MediaDataCodec::CreateEncoder(
     webrtc::VideoCodecType aCodecType) {
-#ifdef MOZ_APPLEMEDIA
+#if defined(MOZ_APPLEMEDIA) || defined(MOZ_WIDGET_ANDROID)
   if (aCodecType == webrtc::VideoCodecType::kVideoCodecH264) {
     return new WebrtcVideoEncoderProxy(new WebrtcMediaDataEncoder());
   }
 #endif
   return nullptr;
 }
 
 /* static */