summaryrefslogtreecommitdiffstats
path: root/DEPS
diff options
context:
space:
mode:
authorfbarchard@chromium.org <fbarchard@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-09-24 22:07:49 +0000
committerfbarchard@chromium.org <fbarchard@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-09-24 22:07:49 +0000
commit7d5fa7f49a30e7bf5bac2f02a08830bb2b247fb0 (patch)
tree1135ca8b3aa4bed18ab51c6982a573bfee28ef72 /DEPS
parent9b4418217868222c0781ec072780dd6ac266b672 (diff)
downloadchromium_src-7d5fa7f49a30e7bf5bac2f02a08830bb2b247fb0.zip
chromium_src-7d5fa7f49a30e7bf5bac2f02a08830bb2b247fb0.tar.gz
chromium_src-7d5fa7f49a30e7bf5bac2f02a08830bb2b247fb0.tar.bz2
ffmpeg roll for chromium
BUG=23916, 55562, 56561 TEST=should build with clang & freebsd Review URL: http://codereview.chromium.org/3417020 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@60533 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'DEPS')
-rw-r--r--DEPS4
1 files changed, 2 insertions, 2 deletions
diff --git a/DEPS b/DEPS
index aedaa39..0b7a8cc 100644
--- a/DEPS
+++ b/DEPS
@@ -3,13 +3,13 @@ vars = {
"webkit_trunk": "http://svn.webkit.org/repository/webkit/trunk",
"nacl_trunk": "http://src.chromium.org/native_client/trunk",
"webkit_revision": "68286",
- "ffmpeg_revision": "58574",
"skia_revision": "599",
"chromium_git": "http://src.chromium.org/git",
"swig_revision": "40423",
"nacl_revision": "3186",
- "libvpx_revision": "60261",
"libjingle_revision": "29",
+ "libvpx_revision": "60399",
+ "ffmpeg_revision": "60496",
}
deps = {