Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(253)

Unified Diff: DEPS

Issue 215016: Update ffmpeg binaries directories to support variants based off the target architecture. (Closed)
Patch Set: Fix linux installer. Created 11 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | build/common.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: DEPS
diff --git a/DEPS b/DEPS
index a0706432f4acdc04cce33affcaa38ff7af051082..52312784d9bc19cac3d7e48aff49fafde1af745e 100644
--- a/DEPS
+++ b/DEPS
@@ -2,6 +2,7 @@ vars = {
"webkit_trunk":
"http://svn.webkit.org/repository/webkit/trunk",
"webkit_revision": "48500",
+ "ffmpeg_revision": "26428",
}
deps = {
@@ -94,8 +95,8 @@ deps_os = {
"src/third_party/python_24":
"/trunk/deps/third_party/python_24@22967",
- "src/third_party/ffmpeg/binaries/chromium":
- "/trunk/deps/third_party/ffmpeg/binaries/win@25436",
+ "src/third_party/ffmpeg/binaries/chromium/win/ia32":
+ "/trunk/deps/third_party/ffmpeg/binaries/win@" + Var("ffmpeg_revision"),
"src/third_party/pthreads-win32":
"/trunk/deps/third_party/pthreads-win32@26337",
@@ -109,15 +110,31 @@ deps_os = {
Var("webkit_trunk") + "/WebKit/mac@" + Var("webkit_revision"),
"src/third_party/WebKit/WebKitLibraries":
Var("webkit_trunk") + "/WebKitLibraries@" + Var("webkit_revision"),
- "src/third_party/ffmpeg/binaries/chromium":
- "/trunk/deps/third_party/ffmpeg/binaries/mac@25436",
+
+ "src/third_party/ffmpeg/binaries/chromium/mac/ia32":
+ "/trunk/deps/third_party/ffmpeg/binaries/mac@" + Var("ffmpeg_revision"),
+ "src/third_party/ffmpeg/binaries/chromium/mac/ia32_dbg":
+ "/trunk/deps/third_party/ffmpeg/binaries/mac_dbg@" +
+ Var("ffmpeg_revision"),
},
"unix": {
# Linux, really.
"src/third_party/xdg-utils":
"/trunk/deps/third_party/xdg-utils@26314",
- "src/third_party/ffmpeg/binaries/chromium":
- "/trunk/deps/third_party/ffmpeg/binaries/linux@25436",
+
+ "src/third_party/ffmpeg/binaries/chromium/linux/ia32":
+ "/trunk/deps/third_party/ffmpeg/binaries/linux@" +
+ Var("ffmpeg_revision"),
+ "src/third_party/ffmpeg/binaries/chromium/linux/ia32_dbg":
+ "/trunk/deps/third_party/ffmpeg/binaries/linux_dbg@" +
+ Var("ffmpeg_revision"),
+
+ "src/third_party/ffmpeg/binaries/chromium/linux/x64":
+ "/trunk/deps/third_party/ffmpeg/binaries/linux_64@" +
+ Var("ffmpeg_revision"),
+ "src/third_party/ffmpeg/binaries/chromium/linux/x64_dbg":
+ "/trunk/deps/third_party/ffmpeg/binaries/linux_64_dbg@" +
+ Var("ffmpeg_revision"),
},
}
« no previous file with comments | « no previous file | build/common.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698