summaryrefslogtreecommitdiffstats
path: root/DEPS
diff options
context:
space:
mode:
authorwatk <watk@chromium.org>2015-03-27 18:27:21 -0700
committerCommit bot <commit-bot@chromium.org>2015-03-28 01:28:10 +0000
commite4af35fab321fa29f1c1a0533469e44d58d4a46e (patch)
treea18a55996fab841d00935b8f4ee997cd6ba88a9f /DEPS
parent8e752353b04c52cb3ba1d54b79fce241c0be53d3 (diff)
downloadchromium_src-e4af35fab321fa29f1c1a0533469e44d58d4a46e.zip
chromium_src-e4af35fab321fa29f1c1a0533469e44d58d4a46e.tar.gz
chromium_src-e4af35fab321fa29f1c1a0533469e44d58d4a46e.tar.bz2
Revert of FFmpeg roll for M43. (patchset #2 id:20001 of https://codereview.chromium.org/1032543004/)
Reason for revert: Failed to compile: http://build.chromium.org/p/chromium.gpu/builders/GPU%20Mac%20Builder/builds/30642 Original issue's description: > FFmpeg roll for M43. > > Update FFmpegDemuxer::OnFindStreamInfoDone with the new > AVFormatContext layout. > > BUG=465940 > > Committed: https://crrev.com/02c707cdd098e97dd78c3ff2858576dcbcaa9082 > Cr-Commit-Position: refs/heads/master@{#322688} TBR=dalecurtis@chromium.org NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true BUG=465940 Review URL: https://codereview.chromium.org/1046493002 Cr-Commit-Position: refs/heads/master@{#322690}
Diffstat (limited to 'DEPS')
-rw-r--r--DEPS2
1 files changed, 1 insertions, 1 deletions
diff --git a/DEPS b/DEPS
index 278fde8..9659fd1 100644
--- a/DEPS
+++ b/DEPS
@@ -207,7 +207,7 @@ deps = {
Var('chromium_git') + '/chromium/deps/libvpx.git' + '@' + Var('libvpx_revision'),
'src/third_party/ffmpeg':
- Var('chromium_git') + '/chromium/third_party/ffmpeg.git' + '@' + 'f776b2743801160f7bf4377294b9a227f648fb21',
+ Var('chromium_git') + '/chromium/third_party/ffmpeg.git' + '@' + 'b3dc5aa44575049edf6b24e34578487dfaade6a4',
'src/third_party/libjingle/source/talk':
Var('chromium_git') + '/external/webrtc/trunk/talk.git' + '@' + '70cbec23cde10c3b81e591a58f153e83b1fcb74c',