diff options
| author | scherkus@chromium.org <scherkus@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-25 02:35:50 +0000 |
|---|---|---|
| committer | scherkus@chromium.org <scherkus@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-25 02:35:50 +0000 |
| commit | e8ae38c942bb83f77d4488846e2ddba4f751b886 (patch) | |
| tree | 208151180785b8ccafeeb971f25ed9fe217e7934 /DEPS | |
| parent | d1180bc74dfa68be142aff7ccf23a6fb5adad4b5 (diff) | |
| download | chromium_src-e8ae38c942bb83f77d4488846e2ddba4f751b886.zip chromium_src-e8ae38c942bb83f77d4488846e2ddba4f751b886.tar.gz chromium_src-e8ae38c942bb83f77d4488846e2ddba4f751b886.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/1289003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@42573 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'DEPS')
| -rw-r--r-- | DEPS | 10 |
1 files changed, 4 insertions, 6 deletions
@@ -101,6 +101,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"), @@ -186,9 +187,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"), |