diff options
| author | perkj <perkj@chromium.org> | 2016-03-07 21:04:17 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-03-08 05:05:54 +0000 |
| commit | 04b30b54513ba4be7ab776b9b8ea008fe4c61cf7 (patch) | |
| tree | 17c736fc5977c7ee3493c56fabb7a4f36e4d9283 /third_party/libjingle | |
| parent | 3d6170df7108d74888bf545537a484936300e530 (diff) | |
| download | chromium_src-04b30b54513ba4be7ab776b9b8ea008fe4c61cf7.zip chromium_src-04b30b54513ba4be7ab776b9b8ea008fe4c61cf7.tar.gz chromium_src-04b30b54513ba4be7ab776b9b8ea008fe4c61cf7.tar.bz2 | |
Roll WebRTC 11890:11897, Libjingle 11754:11893
WebRTC 11890:11897
Changes: https://chromium.googlesource.com/external/webrtc/trunk/webrtc.git/+log/73a89e6..4b88ad3
Libjingle 11754:11893
Changes: https://chromium.googlesource.com/external/webrtc/trunk/talk.git/+log/a4cc90b..f608241
TBR=
BUG=
Review URL: https://codereview.chromium.org/1771183002
Cr-Commit-Position: refs/heads/master@{#379749}
Diffstat (limited to 'third_party/libjingle')
| -rw-r--r-- | third_party/libjingle/BUILD.gn | 4 | ||||
| -rw-r--r-- | third_party/libjingle/README.chromium | 2 | ||||
| -rw-r--r-- | third_party/libjingle/libjingle.gyp | 4 |
3 files changed, 9 insertions, 1 deletions
diff --git a/third_party/libjingle/BUILD.gn b/third_party/libjingle/BUILD.gn index 1c3e5f9..962ec91 100644 --- a/third_party/libjingle/BUILD.gn +++ b/third_party/libjingle/BUILD.gn @@ -324,6 +324,8 @@ if (enable_webrtc) { "../webrtc/api/statstypes.h", "../webrtc/api/streamcollection.h", "../webrtc/api/umametrics.h", + "../webrtc/api/videocapturertracksource.cc", + "../webrtc/api/videocapturertracksource.h", "../webrtc/api/videosource.cc", "../webrtc/api/videosource.h", "../webrtc/api/videosourceinterface.h", @@ -332,6 +334,8 @@ if (enable_webrtc) { "../webrtc/api/videotrack.h", "../webrtc/api/videotrackrenderers.cc", "../webrtc/api/videotrackrenderers.h", + "../webrtc/api/videotracksource.cc", + "../webrtc/api/videotracksource.h", "../webrtc/api/webrtcsdp.cc", "../webrtc/api/webrtcsdp.h", "../webrtc/api/webrtcsession.cc", diff --git a/third_party/libjingle/README.chromium b/third_party/libjingle/README.chromium index 4abaaf0..a1fcda4 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: 11754 +Revision: 11893 License: BSD License File: source/talk/COPYING Security Critical: yes diff --git a/third_party/libjingle/libjingle.gyp b/third_party/libjingle/libjingle.gyp index 6edf17f..586368c 100644 --- a/third_party/libjingle/libjingle.gyp +++ b/third_party/libjingle/libjingle.gyp @@ -289,6 +289,8 @@ '<(DEPTH)/third_party/webrtc/api/statstypes.h', '<(DEPTH)/third_party/webrtc/api/streamcollection.h', '<(DEPTH)/third_party/webrtc/api/umametrics.h', + '<(DEPTH)/third_party/webrtc/api/videocapturertracksource.cc', + '<(DEPTH)/third_party/webrtc/api/videocapturertracksource.h', '<(DEPTH)/third_party/webrtc/api/videosource.cc', '<(DEPTH)/third_party/webrtc/api/videosource.h', '<(DEPTH)/third_party/webrtc/api/videosourceinterface.h', @@ -297,6 +299,8 @@ '<(DEPTH)/third_party/webrtc/api/videotrack.h', '<(DEPTH)/third_party/webrtc/api/videotrackrenderers.cc', '<(DEPTH)/third_party/webrtc/api/videotrackrenderers.h', + '<(DEPTH)/third_party/webrtc/api/videotracksource.cc', + '<(DEPTH)/third_party/webrtc/api/videotracksource.h', '<(DEPTH)/third_party/webrtc/api/webrtcsdp.cc', '<(DEPTH)/third_party/webrtc/api/webrtcsdp.h', '<(DEPTH)/third_party/webrtc/api/webrtcsession.cc', |