summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorthestig@chromium.org <thestig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-03-19 01:22:55 +0000
committerthestig@chromium.org <thestig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-03-19 01:22:55 +0000
commitff88f4e0af4dcd145aea4a74c6fbec4aeaeffa68 (patch)
treee28dc5c1d1d2a3cad4ab511bd35aa7f766df6fa1
parentada3d0b2384f7c58b97bdeb41fad00334de3adcb (diff)
downloadchromium_src-ff88f4e0af4dcd145aea4a74c6fbec4aeaeffa68.zip
chromium_src-ff88f4e0af4dcd145aea4a74c6fbec4aeaeffa68.tar.gz
chromium_src-ff88f4e0af4dcd145aea4a74c6fbec4aeaeffa68.tar.bz2
Roll deps to pick up ffmpeg fix from r42055.
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@42056 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--DEPS2
1 files changed, 1 insertions, 1 deletions
diff --git a/DEPS b/DEPS
index dd57187..543a707 100644
--- a/DEPS
+++ b/DEPS
@@ -2,7 +2,7 @@ vars = {
"webkit_trunk":
"http://svn.webkit.org/repository/webkit/trunk",
"webkit_revision": "56165",
- "ffmpeg_revision": "42046",
+ "ffmpeg_revision": "42055",
"skia_revision": "504",
"chromium_git": "http://src.chromium.org/git",
"swig_revision": "40423",