| Index: webrtc/voice_engine/voe_rtp_rtcp_impl.cc
|
| diff --git a/webrtc/voice_engine/voe_rtp_rtcp_impl.cc b/webrtc/voice_engine/voe_rtp_rtcp_impl.cc
|
| index 20f2caf1acde406648006ee4f3ce77d3b1189435..8cdb4f47796a83fb66d2349ae0db698568723729 100644
|
| --- a/webrtc/voice_engine/voe_rtp_rtcp_impl.cc
|
| +++ b/webrtc/voice_engine/voe_rtp_rtcp_impl.cc
|
| @@ -17,27 +17,17 @@
|
| #include "webrtc/voice_engine/channel.h"
|
| #include "webrtc/voice_engine/transmit_mixer.h"
|
|
|
| -#ifndef WEBRTC_VOICE_ENGINE_RTP_RTCP_API
|
| -#error "Deprecated"
|
| -#endif
|
| -
|
| namespace webrtc {
|
|
|
| VoERTP_RTCP* VoERTP_RTCP::GetInterface(VoiceEngine* voiceEngine) {
|
| -#ifndef WEBRTC_VOICE_ENGINE_RTP_RTCP_API
|
| - return NULL;
|
| -#else
|
| if (NULL == voiceEngine) {
|
| return NULL;
|
| }
|
| VoiceEngineImpl* s = static_cast<VoiceEngineImpl*>(voiceEngine);
|
| s->AddRef();
|
| return s;
|
| -#endif
|
| }
|
|
|
| -#ifdef WEBRTC_VOICE_ENGINE_RTP_RTCP_API
|
| -
|
| VoERTP_RTCPImpl::VoERTP_RTCPImpl(voe::SharedData* shared) : _shared(shared) {
|
| WEBRTC_TRACE(kTraceMemory, kTraceVoice, VoEId(_shared->instance_id(), -1),
|
| "VoERTP_RTCPImpl::VoERTP_RTCPImpl() - ctor");
|
| @@ -316,6 +306,4 @@ int VoERTP_RTCPImpl::SetNACKStatus(int channel, bool enable, int maxNoPackets) {
|
| return 0;
|
| }
|
|
|
| -#endif // #ifdef WEBRTC_VOICE_ENGINE_RTP_RTCP_API
|
| -
|
| } // namespace webrtc
|
|
|