diff options
| author | tommi@chromium.org <tommi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-06 02:33:28 +0000 |
|---|---|---|
| committer | tommi@chromium.org <tommi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-06 02:33:28 +0000 |
| commit | 657b6f877cc5422257555ecf96a99a8ab68e1e0e (patch) | |
| tree | 6d09487185a2e39009eb566f45cd4d8d99d9dfd3 /third_party/libjingle | |
| parent | 6b37173d3faead2d1ec067710c12e9bf3493b4f4 (diff) | |
| download | chromium_src-657b6f877cc5422257555ecf96a99a8ab68e1e0e.zip chromium_src-657b6f877cc5422257555ecf96a99a8ab68e1e0e.tar.gz chromium_src-657b6f877cc5422257555ecf96a99a8ab68e1e0e.tar.bz2 | |
Roll libjingle to 98:99.
- Refactoring and bug fixes
- Remove global variables of class type.
NOTE: I'm landing this for Ronghua since he's on leave. The change has already been reviewed here: http://codereview.chromium.org/8790011/
but I had to create a new issue in order to resolve merge conflicts.
TBR=sergeyu
Review URL: http://codereview.chromium.org/8802019
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@113086 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'third_party/libjingle')
| -rw-r--r-- | third_party/libjingle/README.chromium | 7 | ||||
| -rw-r--r-- | third_party/libjingle/libjingle.gyp | 6 |
2 files changed, 12 insertions, 1 deletions
diff --git a/third_party/libjingle/README.chromium b/third_party/libjingle/README.chromium index 297aa71..5165636 100644 --- a/third_party/libjingle/README.chromium +++ b/third_party/libjingle/README.chromium @@ -1,8 +1,11 @@ -Name: libjingle +Name: Libjingle library. Used for p2p voice and video communication. +Short Name: libjingle URL: http://code.google.com/p/libjingle/ Version: 2.7.0 +Revision: 99 License: BSD License File: source/COPYING +Security Critical: yes Description: Libjingle provides xmpp support to the sync code, which @@ -10,3 +13,5 @@ Description: Libjingle is distributed under a Berkeley-style license detailed in source/COPYING. + +Local Modifications: diff --git a/third_party/libjingle/libjingle.gyp b/third_party/libjingle/libjingle.gyp index 5b2e764..4bf71c5 100644 --- a/third_party/libjingle/libjingle.gyp +++ b/third_party/libjingle/libjingle.gyp @@ -207,6 +207,8 @@ 'source/talk/base/httpcommon.h', 'source/talk/base/httprequest.cc', 'source/talk/base/httprequest.h', + 'source/talk/base/ipaddress.cc', + 'source/talk/base/ipaddress.h', 'source/talk/base/json.cc', 'source/talk/base/json.h', 'source/talk/base/linked_ptr.h', @@ -469,6 +471,8 @@ 'source/talk/session/phone/cryptoparams.h', 'source/talk/session/phone/currentspeakermonitor.cc', 'source/talk/session/phone/currentspeakermonitor.h', + 'source/talk/session/phone/devicemanager.cc', + 'source/talk/session/phone/devicemanager.h', 'source/talk/session/phone/dummydevicemanager.cc', 'source/talk/session/phone/dummydevicemanager.h', 'source/talk/session/phone/filemediaengine.cc', @@ -495,6 +499,8 @@ 'source/talk/session/phone/soundclip.h', 'source/talk/session/phone/srtpfilter.cc', 'source/talk/session/phone/srtpfilter.h', + 'source/talk/session/phone/ssrcmuxfilter.cc', + 'source/talk/session/phone/ssrcmuxfilter.h', 'source/talk/session/phone/videocapturer.cc', 'source/talk/session/phone/videocapturer.h', 'source/talk/session/phone/videocommon.cc', |