Index: DEPS |
diff --git a/DEPS b/DEPS |
index b4c8af22b27a9dd607505ecfae8959208ac586b7..e74f81f354c7dfd0e2be8583447dcba858b619be 100644 |
--- a/DEPS |
+++ b/DEPS |
@@ -42,12 +42,6 @@ vars = { |
"libphonenumber_revision": "621", |
"libvpx_revision": "269083", |
"lss_revision": "26", |
- |
- # These two FFmpeg variables must be updated together. One is used for SVN |
- # checkouts and the other for Git checkouts. |
- "ffmpeg_revision": "270146", |
- "ffmpeg_hash": "d3a060bd1d6a4f43e9bc7d07f193b0513df4f244", |
- |
"sfntly_revision": "228", |
"lighttpd_revision": "33737", |
"skia_revision": "14744", |
@@ -218,8 +212,8 @@ deps = { |
Var("libvpx_revision"), |
"src/third_party/ffmpeg": |
- "/trunk/deps/third_party/ffmpeg@" + |
- Var("ffmpeg_revision"), |
+ Var("chromium_git") + |
+ "/chromium/third_party/ffmpeg.git@d3a060bd1d6a4f43e9bc7d07f193b0513df4f244", |
borenet
2014/05/15 20:14:58
You might consider leaving the "ffmpeg_revision" v
|
"src/third_party/libjingle/source/talk": |
(Var("googlecode_url") % "webrtc") + "/trunk/talk@" + |
@@ -289,7 +283,7 @@ deps = { |
Var("libphonenumber_revision"), |
"src/tools/deps2git": |
- "/trunk/tools/deps2git@262731", |
+ "/trunk/tools/deps2git@270777", |
"src/third_party/clang_format/script": |
Var("llvm_url") + "/cfe/trunk/tools/clang-format@206068", |