diff options
| author | mcasas@chromium.org <mcasas@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-08-14 14:22:13 +0000 |
|---|---|---|
| committer | mcasas@chromium.org <mcasas@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-08-14 14:23:49 +0000 |
| commit | 646a59f71ce328a37b07d545fde68fea8758ec76 (patch) | |
| tree | c23bb0fb1e958049b565c26d45dde3e7d6b61974 | |
| parent | aa3ca1c1d5109aafd1137bda680af54cc4be50c5 (diff) | |
| download | chromium_src-646a59f71ce328a37b07d545fde68fea8758ec76.zip chromium_src-646a59f71ce328a37b07d545fde68fea8758ec76.tar.gz chromium_src-646a59f71ce328a37b07d545fde68fea8758ec76.tar.bz2 | |
roll webrtc 6825-6898 and add some missing files to libjingle gyp
TBR=sergeyu@chromium.org
BUG=
Review URL: https://codereview.chromium.org/475683002
Cr-Commit-Position: refs/heads/master@{#289557}
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@289557 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | DEPS | 2 | ||||
| -rw-r--r-- | third_party/libjingle/README.chromium | 2 | ||||
| -rw-r--r-- | third_party/libjingle/libjingle.gyp | 2 |
3 files changed, 4 insertions, 2 deletions
@@ -55,7 +55,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": "6825", + "webrtc_revision": "6898", "jsoncpp_revision": "248", "nss_revision": "287121", # Three lines of non-changing comments so that diff --git a/third_party/libjingle/README.chromium b/third_party/libjingle/README.chromium index 5d2ed5d..0534eaf 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: 6825 +Revision: 6898 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 3e1b8cd..0d8e0fc 100644 --- a/third_party/libjingle/libjingle.gyp +++ b/third_party/libjingle/libjingle.gyp @@ -588,6 +588,8 @@ '<(libjingle_source)/talk/media/webrtc/webrtcmediaengine.cc', '<(libjingle_source)/talk/media/webrtc/webrtcmediaengine.h', '<(libjingle_source)/talk/media/webrtc/webrtcvideoengine.cc', + '<(libjingle_source)/talk/media/webrtc/webrtcvideoframefactory.cc', + '<(libjingle_source)/talk/media/webrtc/webrtcvideoframefactory.h', '<(libjingle_source)/talk/media/webrtc/webrtcvideoengine.h', '<(libjingle_source)/talk/media/webrtc/webrtcvideoengine2.cc', '<(libjingle_source)/talk/media/webrtc/webrtcvideoengine2.h', |