| Index: webrtc/media/engine/webrtcmediaengine.cc
|
| diff --git a/webrtc/media/engine/webrtcmediaengine.cc b/webrtc/media/engine/webrtcmediaengine.cc
|
| index 0643de6d4db9b58a11a8c2d90a958d7b6f0bf21b..45652d0128f9dcb50e2f412315f91379c9de85eb 100644
|
| --- a/webrtc/media/engine/webrtcmediaengine.cc
|
| +++ b/webrtc/media/engine/webrtcmediaengine.cc
|
| @@ -30,8 +30,12 @@ class WebRtcMediaEngine2
|
| public:
|
| WebRtcMediaEngine2(webrtc::AudioDeviceModule* adm,
|
| WebRtcVideoEncoderFactory* encoder_factory,
|
| - WebRtcVideoDecoderFactory* decoder_factory) {
|
| - voice_.SetAudioDeviceModule(adm);
|
| + WebRtcVideoDecoderFactory* decoder_factory)
|
| +#ifdef HAVE_WEBRTC_VIDEO
|
| + : CompositeMediaEngine<WebRtcVoiceEngine, WebRtcVideoEngine2>(adm) {
|
| +#else
|
| + : CompositeMediaEngine<WebRtcVoiceEngine, NullWebRtcVideoEngine>(adm) {
|
| +#endif
|
| video_.SetExternalDecoderFactory(decoder_factory);
|
| video_.SetExternalEncoderFactory(encoder_factory);
|
| }
|
|
|