summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorronghuawu@chromium.org <ronghuawu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-10-05 01:49:26 +0000
committerronghuawu@chromium.org <ronghuawu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-10-05 01:49:26 +0000
commite8bc87b9ddd2694ec55a503cda7d5e1ca2ec7fe8 (patch)
tree9636258a6a67d0bc59b6b33520c304e68809b118
parent07367ba13ab2a0a833ef3c563beb156dac4cc89e (diff)
downloadchromium_src-e8bc87b9ddd2694ec55a503cda7d5e1ca2ec7fe8.zip
chromium_src-e8bc87b9ddd2694ec55a503cda7d5e1ca2ec7fe8.tar.gz
chromium_src-e8bc87b9ddd2694ec55a503cda7d5e1ca2ec7fe8.tar.bz2
Update libjingle to r199.
BUG=http://code.google.com/p/webrtc/issues/detail?id=863 TEST=try bots and pyauto tests Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=160059 Review URL: https://codereview.chromium.org/10989064 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@160296 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--DEPS2
-rw-r--r--third_party/libjingle/README.chromium2
-rw-r--r--third_party/libjingle/libjingle.gyp4
3 files changed, 6 insertions, 2 deletions
diff --git a/DEPS b/DEPS
index 7eec134..7b9d32a 100644
--- a/DEPS
+++ b/DEPS
@@ -18,7 +18,7 @@ vars = {
"nacl_tools_revision": "9330", # native_client/DEPS: tools_rev
"gtm_revision": "578",
- "libjingle_revision": "195",
+ "libjingle_revision": "199",
"libphonenumber_revision": "456",
"libvpx_revision": "152423",
"lss_revision": "13",
diff --git a/third_party/libjingle/README.chromium b/third_party/libjingle/README.chromium
index c318541..f9c5c40 100644
--- a/third_party/libjingle/README.chromium
+++ b/third_party/libjingle/README.chromium
@@ -2,7 +2,7 @@ Name: Libjingle library. Used for p2p voice and video communication.
Short Name: libjingle
URL: http://code.google.com/p/libjingle/
Version: unknown
-Revision: 193
+Revision: 199
License: BSD
License File: source/COPYING
Security Critical: yes
diff --git a/third_party/libjingle/libjingle.gyp b/third_party/libjingle/libjingle.gyp
index 0ca9421..ccdc2bd 100644
--- a/third_party/libjingle/libjingle.gyp
+++ b/third_party/libjingle/libjingle.gyp
@@ -546,6 +546,10 @@
'source/talk/app/webrtc/webrtcsdp.h',
'source/talk/app/webrtc/webrtcsession.cc',
'source/talk/app/webrtc/webrtcsession.h',
+ 'source/talk/media/base/capturemanager.cc',
+ 'source/talk/media/base/capturemanager.h',
+ 'source/talk/media/base/capturerenderadapter.cc',
+ 'source/talk/media/base/capturerenderadapter.h',
'source/talk/media/base/codec.cc',
'source/talk/media/base/codec.h',
'source/talk/media/base/constants.cc',