diff options
| author | scherkus@chromium.org <scherkus@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-12 02:57:38 +0000 |
|---|---|---|
| committer | scherkus@chromium.org <scherkus@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-12 02:57:38 +0000 |
| commit | 3cb29296dd9eb603f033a527e33f5e40eea90c9d (patch) | |
| tree | 4a7967c1f9ff805fe8c3dbc4c824956b64d6048d /DEPS | |
| parent | 057d959ad8fa954e5ead634ff1d29e4d75f28678 (diff) | |
| download | chromium_src-3cb29296dd9eb603f033a527e33f5e40eea90c9d.zip chromium_src-3cb29296dd9eb603f033a527e33f5e40eea90c9d.tar.gz chromium_src-3cb29296dd9eb603f033a527e33f5e40eea90c9d.tar.bz2 | |
Removed custom FFmpegLock. Removed ffmpeg headers from third_party/ffmpeg/include.
Patch by sergeyu@chromium.org
BUG=23271
TEST=none
Review URL: http://codereview.chromium.org/909002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@41386 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'DEPS')
| -rw-r--r-- | DEPS | 10 |
1 files changed, 4 insertions, 6 deletions
@@ -104,6 +104,10 @@ 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@" + + Var("ffmpeg_revision"), } @@ -165,9 +169,6 @@ deps_os = { # 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/swig/mac": "/trunk/deps/third_party/swig/mac@" + Var("swig_revision"), @@ -183,9 +184,6 @@ deps_os = { # 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/swig/linux": "/trunk/deps/third_party/swig/linux@" + Var("swig_revision"), |