summaryrefslogtreecommitdiffstats
path: root/DEPS
diff options
context:
space:
mode:
authordalecurtis <dalecurtis@chromium.org>2015-09-23 20:07:35 -0700
committerCommit bot <commit-bot@chromium.org>2015-09-24 03:08:28 +0000
commit59f2d953d3f336c52f6832a314372a5ed04eaaee (patch)
treec7993080fa2014dd6635d9f101c24dc55060633e /DEPS
parent32df3c4353b7b6ba2c763aec80594876e39f3f3b (diff)
downloadchromium_src-59f2d953d3f336c52f6832a314372a5ed04eaaee.zip
chromium_src-59f2d953d3f336c52f6832a314372a5ed04eaaee.tar.gz
chromium_src-59f2d953d3f336c52f6832a314372a5ed04eaaee.tar.bz2
Update DEPS for ffmpeg to pickup GN linking fix.
BUG=none TEST=bots TBR=brettw Review URL: https://codereview.chromium.org/1363873003 Cr-Commit-Position: refs/heads/master@{#350459}
Diffstat (limited to 'DEPS')
-rw-r--r--DEPS2
1 files changed, 1 insertions, 1 deletions
diff --git a/DEPS b/DEPS
index b1fdc88..af4a973 100644
--- a/DEPS
+++ b/DEPS
@@ -188,7 +188,7 @@ deps = {
Var('chromium_git') + '/webm/libvpx.git' + '@' + '90a109f0eef8bfaaa4869cf7b2873dac5076b582',
'src/third_party/ffmpeg':
- Var('chromium_git') + '/chromium/third_party/ffmpeg.git' + '@' + '382b031ebab06b25df0708dd44aafad235657d2c',
+ Var('chromium_git') + '/chromium/third_party/ffmpeg.git' + '@' + '9055a855511af7170daa498409227cacaca51c0c',
'src/third_party/libjingle/source/talk':
Var('chromium_git') + '/external/webrtc/trunk/talk.git' + '@' + '228d997b9a60b755dbc985b78b3053dc461b4be7', # commit position 10022