summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMagnus Jedvert <magjed@google.com>2015-02-24 12:27:34 +0100
committerMagnus Jedvert <magjed@google.com>2015-02-24 11:29:13 +0000
commite14d2ddde29e1cbce523fe00a03a1f1b9d42e6fa (patch)
treec291803cba1828fd73da0f3256114f72569e5b55
parentaa9c9394cd313bfb368a1c79a5d5599d8b280575 (diff)
downloadchromium_src-e14d2ddde29e1cbce523fe00a03a1f1b9d42e6fa.zip
chromium_src-e14d2ddde29e1cbce523fe00a03a1f1b9d42e6fa.tar.gz
chromium_src-e14d2ddde29e1cbce523fe00a03a1f1b9d42e6fa.tar.bz2
Roll WebRTC 8443:8467, Libjingle 8444:8468
WebRTC 8443:8467 Changes: https://chromium.googlesource.com/external/webrtc/trunk/webrtc.git/+log/de41287..be487b4 Libjingle 8444:8468 Changes: https://chromium.googlesource.com/external/webrtc/trunk/talk.git/+log/0366d0b..fe7ee2e TBR=tommi Review URL: https://codereview.chromium.org/952833002 Cr-Commit-Position: refs/heads/master@{#317782}
-rw-r--r--DEPS4
-rw-r--r--third_party/libjingle/README.chromium2
2 files changed, 3 insertions, 3 deletions
diff --git a/DEPS b/DEPS
index 3458558..ed5b1ac 100644
--- a/DEPS
+++ b/DEPS
@@ -210,7 +210,7 @@ deps = {
Var('chromium_git') + '/chromium/third_party/ffmpeg.git' + '@' + 'f5698b4f3e3e8eacad18d77cf69882fe14015de5',
'src/third_party/libjingle/source/talk':
- Var('chromium_git') + '/external/webrtc/trunk/talk.git' + '@' + '0366d0b6d9dddb3d775d7ed8919c56a729cfe82f',
+ Var('chromium_git') + '/external/webrtc/trunk/talk.git' + '@' + 'fe7ee2eda9a760ebf141a87b12ca6d61185412ac',
'src/third_party/usrsctp/usrsctplib':
Var('chromium_git') + '/external/usrsctplib.git' + '@' + '13718c7b9fd376fde092cbd3c5347d15059ac652', # from svn revision 9167
@@ -234,7 +234,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' + '@' + 'de41287e2e18ab6859359f03f8cbdeceee1d0fe2',
+ Var('chromium_git') + '/external/webrtc/trunk/webrtc.git' + '@' + 'be487b41878ee739f767c0507346a69a36838c60',
'src/third_party/openmax_dl':
Var('chromium_git') + '/external/webrtc/deps/third_party/openmax.git' + '@' + Var('openmax_dl_revision'),
diff --git a/third_party/libjingle/README.chromium b/third_party/libjingle/README.chromium
index 84fe4ae..6b92a62 100644
--- a/third_party/libjingle/README.chromium
+++ b/third_party/libjingle/README.chromium
@@ -1,7 +1,7 @@
Name: libjingle
URL: http://code.google.com/p/webrtc/
Version: unknown
-Revision: 8444
+Revision: 8468
License: BSD
License File: source/talk/COPYING
Security Critical: yes