summaryrefslogtreecommitdiffstats
path: root/DEPS
diff options
context:
space:
mode:
authorthakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-08-19 20:36:29 +0000
committerthakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-08-19 20:37:39 +0000
commitc332e3278050d3e19676a38af53e0e88b997e1e9 (patch)
tree88d65a246c2eb8942537ebc2fd1b54ecaa535f7e /DEPS
parent8ff4fc3dbd7046a26b87953d22a038895aaef08e (diff)
downloadchromium_src-c332e3278050d3e19676a38af53e0e88b997e1e9.zip
chromium_src-c332e3278050d3e19676a38af53e0e88b997e1e9.tar.gz
chromium_src-c332e3278050d3e19676a38af53e0e88b997e1e9.tar.bz2
Roll ffmpeg.
Only pulls in ffmpeg.gyp changes that tweak clang warning flags: https://gerrit.chromium.org/gerrit/#/c/71267/ BUG=82385 R=dalecurtis@chromium.org TBR=dalecurtis@chromium.org Review URL: https://codereview.chromium.org/485303002 Cr-Commit-Position: refs/heads/master@{#290656} git-svn-id: svn://svn.chromium.org/chrome/trunk/src@290656 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 4da5d307..1fde3ca 100644
--- a/DEPS
+++ b/DEPS
@@ -219,7 +219,7 @@ deps = {
"src/third_party/ffmpeg":
Var("chromium_git") +
- "/chromium/third_party/ffmpeg.git@5961d8ac36f995dc3162aff7f8039ef7d772aaac",
+ "/chromium/third_party/ffmpeg.git@95a2bce6dad6569ec65b547169f4a9d58877a1f4",
"src/third_party/libjingle/source/talk":
(Var("googlecode_url") % "webrtc") + "/trunk/talk@" +