summaryrefslogtreecommitdiffstats
path: root/DEPS
diff options
context:
space:
mode:
authorthestig@chromium.org <thestig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-03-19 07:21:18 +0000
committerthestig@chromium.org <thestig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-03-19 07:21:18 +0000
commit08977cda717b5dd0cc8f79ef18910902e773abe6 (patch)
tree5e75f5cfa53c472d3475ac6d37296b2f160af089 /DEPS
parent014c0330c5da4e22329973a741ddae1d1cfdb8bc (diff)
downloadchromium_src-08977cda717b5dd0cc8f79ef18910902e773abe6.zip
chromium_src-08977cda717b5dd0cc8f79ef18910902e773abe6.tar.gz
chromium_src-08977cda717b5dd0cc8f79ef18910902e773abe6.tar.bz2
Roll deps to pick up ffmpeg fix from r42082 and fix a missing file in ffmpeg.gyp.
TBR=fbarchard BUG=none TEST=none Review URL: http://codereview.chromium.org/1133006 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@42084 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'DEPS')
-rw-r--r--DEPS2
1 files changed, 1 insertions, 1 deletions
diff --git a/DEPS b/DEPS
index bd45f2d..e8d3b10 100644
--- a/DEPS
+++ b/DEPS
@@ -2,7 +2,7 @@ vars = {
"webkit_trunk":
"http://svn.webkit.org/repository/webkit/trunk",
"webkit_revision": "56197",
- "ffmpeg_revision": "42055",
+ "ffmpeg_revision": "42082",
"skia_revision": "504",
"chromium_git": "http://src.chromium.org/git",
"swig_revision": "40423",