diff options
| author | scherkus@chromium.org <scherkus@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-06-02 06:13:07 +0000 |
|---|---|---|
| committer | scherkus@chromium.org <scherkus@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-06-02 06:13:07 +0000 |
| commit | 25ebc08095e546abe066502ab071d7bb2c7fc5f1 (patch) | |
| tree | afefb26c858e1c4cf10ebd0f80420b1f44476a00 | |
| parent | 98d94fe7c7c2fbfc2734dfd91fd4487858821499 (diff) | |
| download | chromium_src-25ebc08095e546abe066502ab071d7bb2c7fc5f1.zip chromium_src-25ebc08095e546abe066502ab071d7bb2c7fc5f1.tar.gz chromium_src-25ebc08095e546abe066502ab071d7bb2c7fc5f1.tar.bz2 | |
Revert "Revert 48697 - ffmpeg roll to deps version that contains gyp and source"
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@48703 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": "47712", + "ffmpeg_revision": "48686", "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/source/patched-ffmpeg-mt": - "/trunk/deps/third_party/ffmpeg/patched-ffmpeg-mt@" + + "src/third_party/ffmpeg": + "/trunk/deps/third_party/ffmpeg/source@" + Var("ffmpeg_revision"), "src/third_party/libvpx/include": |