diff options
| author | tommi <tommi@chromium.org> | 2015-12-12 09:36:14 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-12-12 17:36:57 +0000 |
| commit | d6f2c6a0858ebc64595c1a8f706b3f9c755557bd (patch) | |
| tree | b6fcc86de41550bc159a1bcb9ea1e689843ad045 | |
| parent | 366297d4d2a2b42ed3b02bdb504fe7d1fc15364f (diff) | |
| download | chromium_src-d6f2c6a0858ebc64595c1a8f706b3f9c755557bd.zip chromium_src-d6f2c6a0858ebc64595c1a8f706b3f9c755557bd.tar.gz chromium_src-d6f2c6a0858ebc64595c1a8f706b3f9c755557bd.tar.bz2 | |
Roll WebRTC 10992:10998, Libjingle 10991:10999
WebRTC 10992:10998
Changes: https://chromium.googlesource.com/external/webrtc/trunk/webrtc.git/+log/1961b16..680196c
Libjingle 10991:10999
Changes: https://chromium.googlesource.com/external/webrtc/trunk/talk.git/+log/ae5cc13..f2f143f
TBR=
BUG=
Review URL: https://codereview.chromium.org/1521213002
Cr-Commit-Position: refs/heads/master@{#364936}
| -rw-r--r-- | DEPS | 4 | ||||
| -rw-r--r-- | third_party/libjingle/README.chromium | 2 |
2 files changed, 3 insertions, 3 deletions
@@ -187,7 +187,7 @@ deps = { Var('chromium_git') + '/chromium/third_party/ffmpeg.git' + '@' + '8a728cadef0d39ae0af732461078015e90384abc', 'src/third_party/libjingle/source/talk': - Var('chromium_git') + '/external/webrtc/trunk/talk.git' + '@' + 'ae5cc13230c8f523685b1a4c09eddc90741e0c40', # commit position 10991 + Var('chromium_git') + '/external/webrtc/trunk/talk.git' + '@' + 'f2f143fd6169378519543704aeda9621a7c6f6dc', # commit position 10999 'src/third_party/usrsctp/usrsctplib': Var('chromium_git') + '/external/github.com/sctplab/usrsctp' + '@' + 'c60ec8b35c3fe6027d7a3faae89d1c8d7dd3ce98', @@ -211,7 +211,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' + '@' + '1961b16b2a15cb19b27c130e53a6d2fed251321f', # commit position 10992 + Var('chromium_git') + '/external/webrtc/trunk/webrtc.git' + '@' + '680196c92ae4a43e3d333358e610bb4ae8a33c82', # commit position 10998 '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 d5a3d7d..fdd9f95 100644 --- a/third_party/libjingle/README.chromium +++ b/third_party/libjingle/README.chromium @@ -1,7 +1,7 @@ Name: libjingle URL: http://www.webrtc.org Version: unknown -Revision: 10991 +Revision: 10999 License: BSD License File: source/talk/COPYING Security Critical: yes |