diff options
| author | jshin@chromium.org <jshin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-06-02 05:34:04 +0000 |
|---|---|---|
| committer | jshin@chromium.org <jshin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-06-02 05:34:04 +0000 |
| commit | 98d94fe7c7c2fbfc2734dfd91fd4487858821499 (patch) | |
| tree | 12511168f6521bba3f55f86432ff4599615c4628 | |
| parent | f00b965997cae21adab56e0a8eb027bd7e7e2982 (diff) | |
| download | chromium_src-98d94fe7c7c2fbfc2734dfd91fd4487858821499.zip chromium_src-98d94fe7c7c2fbfc2734dfd91fd4487858821499.tar.gz chromium_src-98d94fe7c7c2fbfc2734dfd91fd4487858821499.tar.bz2 | |
Revert 48697 - ffmpeg roll to deps version that contains gyp and source
BUG=42238
TEST=none
Review URL: http://codereview.chromium.org/2475001
TBR=fbarchard@chromium.org
Review URL: http://codereview.chromium.org/2447003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@48702 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | DEPS | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -2,7 +2,7 @@ vars = { "webkit_trunk": "http://svn.webkit.org/repository/webkit/trunk", "webkit_revision": "60528", - "ffmpeg_revision": "48686", + "ffmpeg_revision": "47712", "skia_revision": "562", "chromium_git": "http://src.chromium.org/git", "swig_revision": "40423", @@ -139,8 +139,8 @@ deps = { "src/third_party/swig/Lib": "/trunk/deps/third_party/swig/Lib@" + Var("swig_revision"), - "src/third_party/ffmpeg": - "/trunk/deps/third_party/ffmpeg/source@" + + "src/third_party/ffmpeg/source/patched-ffmpeg-mt": + "/trunk/deps/third_party/ffmpeg/patched-ffmpeg-mt@" + Var("ffmpeg_revision"), "src/third_party/libvpx/include": |