diff options
| author | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-04 03:13:04 +0000 |
|---|---|---|
| committer | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-04 03:13:04 +0000 |
| commit | 097b7c65bb67bbd39fcea7c0e411f9b15794dc7e (patch) | |
| tree | 143313fa4070c2b6a4fc81f0003d03ca74e62e8d /third_party | |
| parent | 4a25b815fc9a147a9976afd0a443136ae4f83085 (diff) | |
| download | chromium_src-097b7c65bb67bbd39fcea7c0e411f9b15794dc7e.zip chromium_src-097b7c65bb67bbd39fcea7c0e411f9b15794dc7e.tar.gz chromium_src-097b7c65bb67bbd39fcea7c0e411f9b15794dc7e.tar.bz2 | |
Revert 160059 (added these static initializers:
# capturemanager.cc cricket::VideoCapturerState::kDefaultCaptureFormat
# capturemanager.cc cricket::VideoCapturerState::kDefaultCaptureFormat+0x10
# capturemanager.cc cricket::VideoCapturerState::kDefaultCaptureFormat+0x4
# capturemanager.cc cricket::VideoCapturerState::kDefaultCaptureFormat+0x8
)- Update libjingle to r197.
BUG=http://code.google.com/p/webrtc/issues/detail?id=863
TEST=try bots and pyauto tests
Review URL: https://chromiumcodereview.appspot.com/10989064
TBR=ronghuawu@chromium.org
Review URL: https://codereview.chromium.org/11031038
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@160063 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'third_party')
| -rw-r--r-- | third_party/libjingle/README.chromium | 2 | ||||
| -rw-r--r-- | third_party/libjingle/libjingle.gyp | 4 |
2 files changed, 1 insertions, 5 deletions
diff --git a/third_party/libjingle/README.chromium b/third_party/libjingle/README.chromium index 673ca2f..c318541 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: 198 +Revision: 193 License: BSD License File: source/COPYING Security Critical: yes diff --git a/third_party/libjingle/libjingle.gyp b/third_party/libjingle/libjingle.gyp index ccdc2bd..0ca9421 100644 --- a/third_party/libjingle/libjingle.gyp +++ b/third_party/libjingle/libjingle.gyp @@ -546,10 +546,6 @@ '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', |