diff options
| author | Andras Becsi <andras.becsi@digia.com> | 2014-03-25 14:55:56 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-03-28 17:20:36 +0100 |
| commit | 25ff83bc7b3e921aa540b88f6c848a78ee7d461f (patch) | |
| tree | 4a455f2410e5e1c0cbdfd91a4dce40c75532c9f0 /patches/chromium/third_party/libjingle/source/talk/0001-Do-not-forward-declare-WebRtcVoiceChannelInfo.patch | |
| parent | 175dba21885a5bcbd031c1cbc394825b5fbb783e (diff) | |
Update patches to stable branch 1750
Change-Id: I85149bf4405420813d07bee5259f11a192e86a73
Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
Reviewed-by: Zoltan Arvai <zarvai@inf.u-szeged.hu>
Diffstat (limited to 'patches/chromium/third_party/libjingle/source/talk/0001-Do-not-forward-declare-WebRtcVoiceChannelInfo.patch')
| -rw-r--r-- | patches/chromium/third_party/libjingle/source/talk/0001-Do-not-forward-declare-WebRtcVoiceChannelInfo.patch | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/patches/chromium/third_party/libjingle/source/talk/0001-Do-not-forward-declare-WebRtcVoiceChannelInfo.patch b/patches/chromium/third_party/libjingle/source/talk/0001-Do-not-forward-declare-WebRtcVoiceChannelInfo.patch index 5af44662d..ee78844fb 100644 --- a/patches/chromium/third_party/libjingle/source/talk/0001-Do-not-forward-declare-WebRtcVoiceChannelInfo.patch +++ b/patches/chromium/third_party/libjingle/source/talk/0001-Do-not-forward-declare-WebRtcVoiceChannelInfo.patch @@ -14,11 +14,11 @@ This fixes the fixes the "error: field has incomplete type" compiler error. 2 files changed, 12 insertions(+), 14 deletions(-) diff --git a/media/webrtc/webrtcvoiceengine.cc b/media/webrtc/webrtcvoiceengine.cc -index 2a6ccd7..8686038 100644 +index 51da9ac..3bdc403 100644 --- a/media/webrtc/webrtcvoiceengine.cc +++ b/media/webrtc/webrtcvoiceengine.cc -@@ -1475,19 +1475,6 @@ void WebRtcVoiceEngine::StopAecDump() { - } +@@ -1620,19 +1620,6 @@ int WebRtcVoiceEngine::CreateSoundclipVoiceChannel() { + return CreateVoiceChannel(voe_wrapper_sc_.get()); } -// This struct relies on the generated copy constructor and assignment operator @@ -38,10 +38,10 @@ index 2a6ccd7..8686038 100644 WebRtcVoiceMediaChannel::WebRtcVoiceMediaChannel(WebRtcVoiceEngine *engine) : WebRtcMediaChannel<VoiceMediaChannel, WebRtcVoiceEngine>( diff --git a/media/webrtc/webrtcvoiceengine.h b/media/webrtc/webrtcvoiceengine.h -index 6cb0b30..62d3bc1 100644 +index 23d97f5..6a2c6d8 100644 --- a/media/webrtc/webrtcvoiceengine.h +++ b/media/webrtc/webrtcvoiceengine.h -@@ -374,7 +374,18 @@ class WebRtcVoiceMediaChannel +@@ -388,7 +388,18 @@ class WebRtcVoiceMediaChannel static Error WebRtcErrorToChannelError(int err_code); private: |