Commit 688f01bd authored by dalecurtis@google.com's avatar dalecurtis@google.com

Switch FFmpeg from svn/git-svn translation to using git directly.

Includes the deps2git roll to remove special cased ffmpeg setup.

BUG=329002
TEST=gclient sync works
R=mmoss@chromium.org

Review URL: https://codereview.chromium.org/191553002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@271050 0039d316-1c4b-4281-b951-d872f2087c98
parent dbc23093
......@@ -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": "14757",
......@@ -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",
"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",
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment