diff options
| -rw-r--r-- | DEPS | 4 | ||||
| -rw-r--r-- | content/renderer/media/webrtc_audio_device_impl.h | 2 | ||||
| -rw-r--r-- | third_party/libjingle/README.chromium | 2 | ||||
| -rw-r--r-- | third_party/libjingle/libjingle.gyp | 3 |
4 files changed, 4 insertions, 7 deletions
@@ -18,7 +18,7 @@ vars = { "nacl_tools_revision": "9330", # native_client/DEPS: tools_rev "gtm_revision": "578", - "libjingle_revision": "202", + "libjingle_revision": "199", "libphonenumber_revision": "456", "libvpx_revision": "152423", "lss_revision": "13", @@ -37,7 +37,7 @@ vars = { # Three lines of non-changing comments so that # the commit queue can handle CLs rolling WebRTC # and V8 without interference from each other. - "webrtc_revision": "2881", + "webrtc_revision": "2718", "jsoncpp_revision": "248", "nss_revision": "158129", } diff --git a/content/renderer/media/webrtc_audio_device_impl.h b/content/renderer/media/webrtc_audio_device_impl.h index a63acd7..b6db9fd 100644 --- a/content/renderer/media/webrtc_audio_device_impl.h +++ b/content/renderer/media/webrtc_audio_device_impl.h @@ -16,7 +16,7 @@ #include "content/common/content_export.h" #include "media/audio/audio_input_device.h" #include "media/base/audio_renderer_sink.h" -#include "third_party/webrtc/modules/audio_device/include/audio_device.h" +#include "third_party/webrtc/modules/audio_device/main/interface/audio_device.h" // A WebRtcAudioDeviceImpl instance implements the abstract interface // webrtc::AudioDeviceModule which makes it possible for a user (e.g. webrtc:: diff --git a/third_party/libjingle/README.chromium b/third_party/libjingle/README.chromium index ee0c986..f9c5c40 100644 --- a/third_party/libjingle/README.chromium +++ b/third_party/libjingle/README.chromium @@ -2,7 +2,7 @@ Name: Libjingle library. Used for p2p voice and video communication. Short Name: libjingle URL: http://code.google.com/p/libjingle/ Version: unknown -Revision: 202 +Revision: 199 License: BSD License File: source/COPYING Security Critical: yes diff --git a/third_party/libjingle/libjingle.gyp b/third_party/libjingle/libjingle.gyp index c4d3e07..ccdc2bd 100644 --- a/third_party/libjingle/libjingle.gyp +++ b/third_party/libjingle/libjingle.gyp @@ -23,9 +23,6 @@ 'NO_SOUND_SYSTEM', 'SRTP_RELATIVE_PATH', '_USE_32BIT_TIME_T', - # TODO(ronghuawu): Remove this once libjingle is updated to use the new - # webrtc. - 'USE_WEBRTC_DEV_BRANCH', ], 'configurations': { 'Debug': { |