summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorfbarchard@chromium.org <fbarchard@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-10-30 00:09:31 +0000
committerfbarchard@chromium.org <fbarchard@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-10-30 00:09:31 +0000
commit8af2495c713e4bd224cccf1ed7ddcc4987cc950b (patch)
tree77e0b0cb44569a91ae058bc90c24fb3abbf1fe5b
parent2140ecf6b6ab13293bb0cc2ac5c4efc7ac574073 (diff)
downloadchromium_src-8af2495c713e4bd224cccf1ed7ddcc4987cc950b.zip
chromium_src-8af2495c713e4bd224cccf1ed7ddcc4987cc950b.tar.gz
chromium_src-8af2495c713e4bd224cccf1ed7ddcc4987cc950b.tar.bz2
Security patches for ffmpeg
BUG=25275 TEST=play src\media\test\data\48_aac_infinite_loop.m4a and it should not hang. Review URL: http://codereview.chromium.org/343046 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@30537 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--DEPS2
1 files changed, 1 insertions, 1 deletions
diff --git a/DEPS b/DEPS
index 684a2127..8450512 100644
--- a/DEPS
+++ b/DEPS
@@ -2,7 +2,7 @@ vars = {
"webkit_trunk":
"http://svn.webkit.org/repository/webkit/trunk",
"webkit_revision": "50258",
- "ffmpeg_revision": "28488",
+ "ffmpeg_revision": "30374",
}
deps = {