Index: third_party/libjingle/overrides/init_webrtc.h |
diff --git a/third_party/libjingle/overrides/init_webrtc.h b/third_party/libjingle/overrides/init_webrtc.h |
index bcf326827ee22014d53c18ee48e1242caa3c49b5..d0bdd432648d25fd45b6ee18333923b821af85d5 100644 |
--- a/third_party/libjingle/overrides/init_webrtc.h |
+++ b/third_party/libjingle/overrides/init_webrtc.h |
@@ -12,6 +12,7 @@ class CommandLine; |
namespace cricket { |
class MediaEngineInterface; |
class WebRtcVideoDecoderFactory; |
+class WebRtcVideoEncoderFactory; |
} // namespace cricket |
namespace webrtc { |
@@ -21,6 +22,7 @@ class AudioDeviceModule; |
typedef cricket::MediaEngineInterface* (*CreateWebRtcMediaEngineFunction)( |
webrtc::AudioDeviceModule* adm, |
webrtc::AudioDeviceModule* adm_sc, |
+ cricket::WebRtcVideoEncoderFactory* encoder_factory, |
cricket::WebRtcVideoDecoderFactory* decoder_factory); |
typedef void (*DestroyWebRtcMediaEngineFunction)( |
@@ -40,11 +42,13 @@ typedef bool (*InitializeModuleFunction)( |
CreateWebRtcMediaEngineFunction* create_media_engine, |
DestroyWebRtcMediaEngineFunction* destroy_media_engine); |
+#if !defined(LIBPEERCONNECTION_IMPLEMENTATION) |
// Load and initialize the shared WebRTC module (libpeerconnection). |
// Call this explicitly to load and initialize the WebRTC module (e.g. before |
// initializing the sandbox in Chrome). |
// If not called explicitly, this function will still be called from the main |
// CreateWebRtcMediaEngine factory function the first time it is called. |
bool InitializeWebRtcModule(); |
+#endif |
#endif // THIRD_PARTY_LIBJINGLE_OVERRIDES_INIT_WEBRTC_H_ |