summaryrefslogtreecommitdiffstats
path: root/DEPS
diff options
context:
space:
mode:
authorfbarchard@chromium.org <fbarchard@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-09-23 07:19:09 +0000
committerfbarchard@chromium.org <fbarchard@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-09-23 07:19:09 +0000
commitf1977d6273599480641201bacec2ac7e4037c0f0 (patch)
treee17cbce517eda84d24eb9a5a793a72c9ce3d6e9b /DEPS
parenta142a910f07db3100ce6c9081731e1826c52ad14 (diff)
downloadchromium_src-f1977d6273599480641201bacec2ac7e4037c0f0.zip
chromium_src-f1977d6273599480641201bacec2ac7e4037c0f0.tar.gz
chromium_src-f1977d6273599480641201bacec2ac7e4037c0f0.tar.bz2
ffmpeg roll for chromium
BUG=23916,55562,56561 TEST=none Review URL: http://codereview.chromium.org/3496003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@60267 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 a7ddd3c..d32b137 100644
--- a/DEPS
+++ b/DEPS
@@ -3,7 +3,7 @@ vars = {
"webkit_trunk": "http://svn.webkit.org/repository/webkit/trunk",
"nacl_trunk": "http://src.chromium.org/native_client/trunk",
"webkit_revision": "68051",
- "ffmpeg_revision": "58574",
+ "ffmpeg_revision": "60147",
"skia_revision": "599",
"chromium_git": "http://src.chromium.org/git",
"swig_revision": "40423",