summaryrefslogtreecommitdiffstats
path: root/DEPS
diff options
context:
space:
mode:
authorjamesr@chromium.org <jamesr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-07-30 10:08:48 +0000
committerjamesr@chromium.org <jamesr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-07-30 10:08:48 +0000
commitc3e84fdf7cef582203ad87c3f2ebc58d73b7a905 (patch)
tree58b80817b6e371643ed878939a965fe18e0d4796 /DEPS
parent84f5b91753fd97401b4bcaa7d0d010943af9236a (diff)
downloadchromium_src-c3e84fdf7cef582203ad87c3f2ebc58d73b7a905.zip
chromium_src-c3e84fdf7cef582203ad87c3f2ebc58d73b7a905.tar.gz
chromium_src-c3e84fdf7cef582203ad87c3f2ebc58d73b7a905.tar.bz2
Roll ffmpeg bffe77c..e2a05d1
Rolls in ffmpegsumo_copy step removal to enable unifying shared object and loadable module directories in GN. TBR=dalecurtis@chromium.org Review URL: https://codereview.chromium.org/429753003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@286463 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 17f621b..035e53b 100644
--- a/DEPS
+++ b/DEPS
@@ -220,7 +220,7 @@ deps = {
"src/third_party/ffmpeg":
Var("chromium_git") +
- "/chromium/third_party/ffmpeg.git@bffe77cd01d3982fe6ba710396615824ae4559ea",
+ "/chromium/third_party/ffmpeg.git@e2a05d173d49547ed8aa5edc0209941a8941f450",
"src/third_party/libjingle/source/talk":
(Var("googlecode_url") % "webrtc") + "/trunk/talk@" +