diff options
| author | jrg@chromium.org <jrg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-12 03:42:09 +0000 |
|---|---|---|
| committer | jrg@chromium.org <jrg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-12 03:42:09 +0000 |
| commit | 5e3e47065c478279a2a3a56c9063405c2e812927 (patch) | |
| tree | c4693e4edc51df3df331fe0d1fe5b17ab5198ed0 /DEPS | |
| parent | 58dd56d1be3b5b4dcba851aebd59b8d3645685e8 (diff) | |
| download | chromium_src-5e3e47065c478279a2a3a56c9063405c2e812927.zip chromium_src-5e3e47065c478279a2a3a56c9063405c2e812927.tar.gz chromium_src-5e3e47065c478279a2a3a56c9063405c2e812927.tar.bz2 | |
Revert 41386 - Removed custom FFmpegLock. Removed ffmpeg headers from third_party/ffmpeg/include.
Bot unhappy
Automatic: "media_unittests" on "Vista Tests" from 41386: ... scherkus@chromium.org ...
http://chrome-buildbot:8010/builders/Vista%20Tests/builds/17009/steps/media_unittests/logs/stdio
Patch by sergeyu@chromium.org
BUG=23271
TEST=none
Review URL: http://codereview.chromium.org/909002
TBR=scherkus@chromium.org
Review URL: http://codereview.chromium.org/854006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@41389 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'DEPS')
| -rw-r--r-- | DEPS | 10 |
1 files changed, 6 insertions, 4 deletions
@@ -104,10 +104,6 @@ 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"), } @@ -169,6 +165,9 @@ 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"), @@ -184,6 +183,9 @@ 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"), |