summaryrefslogtreecommitdiffstats
path: root/DEPS
diff options
context:
space:
mode:
authorfbarchard@chromium.org <fbarchard@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-06-02 03:28:43 +0000
committerfbarchard@chromium.org <fbarchard@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-06-02 03:28:43 +0000
commitf00b965997cae21adab56e0a8eb027bd7e7e2982 (patch)
treeafefb26c858e1c4cf10ebd0f80420b1f44476a00 /DEPS
parent8e06804630e9eb1f9a71e8bd78db161c434d90b5 (diff)
downloadchromium_src-f00b965997cae21adab56e0a8eb027bd7e7e2982.zip
chromium_src-f00b965997cae21adab56e0a8eb027bd7e7e2982.tar.gz
chromium_src-f00b965997cae21adab56e0a8eb027bd7e7e2982.tar.bz2
ffmpeg roll to deps version that contains gyp and source
BUG=42238 TEST=none Review URL: http://codereview.chromium.org/2475001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@48697 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'DEPS')
-rw-r--r--DEPS6
1 files changed, 3 insertions, 3 deletions
diff --git a/DEPS b/DEPS
index 26f0696..1383226 100644
--- a/DEPS
+++ b/DEPS
@@ -2,7 +2,7 @@ vars = {
"webkit_trunk":
"http://svn.webkit.org/repository/webkit/trunk",
"webkit_revision": "60528",
- "ffmpeg_revision": "47712",
+ "ffmpeg_revision": "48686",
"skia_revision": "562",
"chromium_git": "http://src.chromium.org/git",
"swig_revision": "40423",
@@ -139,8 +139,8 @@ deps = {
"src/third_party/swig/Lib":
"/trunk/deps/third_party/swig/Lib@" + Var("swig_revision"),
- "src/third_party/ffmpeg/source/patched-ffmpeg-mt":
- "/trunk/deps/third_party/ffmpeg/patched-ffmpeg-mt@" +
+ "src/third_party/ffmpeg":
+ "/trunk/deps/third_party/ffmpeg/source@" +
Var("ffmpeg_revision"),
"src/third_party/libvpx/include":