summaryrefslogtreecommitdiffstats
path: root/DEPS
diff options
context:
space:
mode:
authorguidou <guidou@chromium.org>2016-03-21 06:29:02 -0700
committerCommit bot <commit-bot@chromium.org>2016-03-21 13:30:19 +0000
commit84eb526a4490fa53af6139d55a5185615aa82fa7 (patch)
tree2e0dee76ee3b7154ceabd8139220c31b25bb7ef8 /DEPS
parent6267408529e279939cffc68740dfe8ac907c2d6d (diff)
downloadchromium_src-84eb526a4490fa53af6139d55a5185615aa82fa7.zip
chromium_src-84eb526a4490fa53af6139d55a5185615aa82fa7.tar.gz
chromium_src-84eb526a4490fa53af6139d55a5185615aa82fa7.tar.bz2
Roll WebRTC 12058:12073, Libjingle 12058:12065
WebRTC 12058:12073 Changes: https://chromium.googlesource.com/external/webrtc/trunk/webrtc.git/+log/0912ecc..43d34df Libjingle 12058:12065 Changes: https://chromium.googlesource.com/external/webrtc/trunk/talk.git/+log/35814a7..b55d904 TBR= BUG= Review URL: https://codereview.chromium.org/1823603002 Cr-Commit-Position: refs/heads/master@{#382274}
Diffstat (limited to 'DEPS')
-rw-r--r--DEPS4
1 files changed, 2 insertions, 2 deletions
diff --git a/DEPS b/DEPS
index beb4461..61cc91b 100644
--- a/DEPS
+++ b/DEPS
@@ -188,7 +188,7 @@ deps = {
Var('chromium_git') + '/chromium/third_party/ffmpeg.git' + '@' + 'beef68513861e11156899b1f763097c31808c418',
'src/third_party/libjingle/source/talk':
- Var('chromium_git') + '/external/webrtc/trunk/talk.git' + '@' + '35814a7f13a476c0e5d40ce74c8dfba902a36645', # commit position 12058
+ Var('chromium_git') + '/external/webrtc/trunk/talk.git' + '@' + 'b55d904a18bca29ce00a7a1b4d9a2b20f09e26ba', # commit position 12065
'src/third_party/usrsctp/usrsctplib':
Var('chromium_git') + '/external/github.com/sctplab/usrsctp' + '@' + 'c60ec8b35c3fe6027d7a3faae89d1c8d7dd3ce98',
@@ -212,7 +212,7 @@ deps = {
Var('chromium_git') + '/native_client/src/third_party/scons-2.0.1.git' + '@' + '1c1550e17fc26355d08627fbdec13d8291227067',
'src/third_party/webrtc':
- Var('chromium_git') + '/external/webrtc/trunk/webrtc.git' + '@' + '0912eccc91eac8d0cca6b61ae580977762119449', # commit position 12058
+ Var('chromium_git') + '/external/webrtc/trunk/webrtc.git' + '@' + '43d34df0c91c8a246ba35a9c9c3e5c91e9f681bf', # commit position 12073
'src/third_party/openmax_dl':
Var('chromium_git') + '/external/webrtc/deps/third_party/openmax.git' + '@' + Var('openmax_dl_revision'),