summaryrefslogtreecommitdiffstats
path: root/DEPS
diff options
context:
space:
mode:
authorajwong@chromium.org <ajwong@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-11-05 00:56:41 +0000
committerajwong@chromium.org <ajwong@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-11-05 00:56:41 +0000
commit995925ba4447efcc0d1d81285504621d87e50662 (patch)
tree9103a423e26ee97b8c7e2cd268a60b73c1721ccd /DEPS
parent92f181bdad8897a5891d6a67a7aa5de7caa8402c (diff)
downloadchromium_src-995925ba4447efcc0d1d81285504621d87e50662.zip
chromium_src-995925ba4447efcc0d1d81285504621d87e50662.tar.gz
chromium_src-995925ba4447efcc0d1d81285504621d87e50662.tar.bz2
FFmpeg in-tree build for mac.
BUG=26509 TEST=none Review URL: http://codereview.chromium.org/340072 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@31050 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'DEPS')
-rw-r--r--DEPS9
1 files changed, 8 insertions, 1 deletions
diff --git a/DEPS b/DEPS
index 61580ee..b6607ca 100644
--- a/DEPS
+++ b/DEPS
@@ -130,6 +130,13 @@ deps_os = {
"src/third_party/WebKit/WebKitLibraries":
Var("webkit_trunk") + "/WebKitLibraries@" + Var("webkit_revision"),
+ # TODO(ajwong): Move this into the OS-independent block.
+ "src/third_party/yasm/source/patched-yasm":
+ "/trunk/deps/third_party/yasm/patched-yasm@29937",
+ "src/third_party/ffmpeg/source/patched-ffmpeg-mt":
+ "/trunk/deps/third_party/ffmpeg/patched-ffmpeg-mt@" +
+ Var("ffmpeg_revision"),
+
"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":
@@ -141,9 +148,9 @@ deps_os = {
"src/third_party/xdg-utils":
"/trunk/deps/third_party/xdg-utils@29103",
+ # TODO(ajwong): Move this into the OS-independent block.
"src/third_party/yasm/source/patched-yasm":
"/trunk/deps/third_party/yasm/patched-yasm@29937",
-
"src/third_party/ffmpeg/source/patched-ffmpeg-mt":
"/trunk/deps/third_party/ffmpeg/patched-ffmpeg-mt@" +
Var("ffmpeg_revision"),