Merge 199462 "Fix libpeerconnection build after a recent libjing..."

third_party/libjingle/overrides/init_webrtc.cc

Index: third_party/libjingle/overrides/init_webrtc.cc
===================================================================
--- third_party/libjingle/overrides/init_webrtc.cc	(revision 199492)
+++ third_party/libjingle/overrides/init_webrtc.cc	(working copy)
@@ -84,13 +84,15 @@
 cricket::MediaEngineInterface* CreateWebRtcMediaEngine(
     webrtc::AudioDeviceModule* adm,
     webrtc::AudioDeviceModule* adm_sc,
+    cricket::WebRtcVideoEncoderFactory* encoder_factory,
     cricket::WebRtcVideoDecoderFactory* decoder_factory) {
   // For convenience of tests etc, we call InitializeWebRtcModule here.
   // For Chrome however, InitializeWebRtcModule must be called
   // explicitly before the sandbox is initialized.  In that case, this call is
   // effectively a noop.
   InitializeWebRtcModule();
-  return g_create_webrtc_media_engine(adm, adm_sc, decoder_factory);
+  return g_create_webrtc_media_engine(adm, adm_sc, encoder_factory,
+      decoder_factory);
 }
 
 void DestroyWebRtcMediaEngine(cricket::MediaEngineInterface* media_engine) {