summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortomfinegan@google.com <tomfinegan@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2010-09-02 08:25:04 +0000
committertomfinegan@google.com <tomfinegan@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2010-09-02 08:25:04 +0000
commit82f676bb237101ed8adeebb4355b969b94c3bfe4 (patch)
treedf75d869143b81e7235dd1ffefa4d01c4a4ba774
parent3a2c22dcd719dbfcebc483987f6eb2364eb9ffbc (diff)
downloadchromium_src-82f676bb237101ed8adeebb4355b969b94c3bfe4.zip
chromium_src-82f676bb237101ed8adeebb4355b969b94c3bfe4.tar.gz
chromium_src-82f676bb237101ed8adeebb4355b969b94c3bfe4.tar.bz2
Roll libvpx from 58133 to 58318, and ffmpeg from 58138 to 58320 to fix
infrequent deadlock in libvpx. BUG=54007 TEST=libvpx multithread decode should no longer deadlock infrequently. Review URL: http://codereview.chromium.org/3295007 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@58332 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--DEPS6
1 files changed, 3 insertions, 3 deletions
diff --git a/DEPS b/DEPS
index ce43d79..00c2ce2 100644
--- a/DEPS
+++ b/DEPS
@@ -2,12 +2,12 @@ vars = {
"webkit_trunk": "http://svn.webkit.org/repository/webkit/trunk",
"nacl_trunk": "http://src.chromium.org/native_client/trunk",
"webkit_revision": "66624",
- "ffmpeg_revision": "58138",
+ "ffmpeg_revision": "58320",
"skia_revision": "593",
"chromium_git": "http://src.chromium.org/git",
"swig_revision": "40423",
"nacl_revision": "3005",
- "libvpx_revision": "58133",
+ "libvpx_revision": "58318",
"libjingle_revision": "27",
}
@@ -216,7 +216,7 @@ deps_os = {
Var("nacl_revision")),
"src/rlz":
- "http://rlz.googlecode.com/svn/trunk@16",
+ "http://rlz.googlecode.com/svn/trunk@15",
},
"mac": {
"src/chrome/tools/test/reference_build/chrome_mac":