summaryrefslogtreecommitdiffstats
path: root/DEPS
diff options
context:
space:
mode:
authordalecurtis@google.com <dalecurtis@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2012-03-14 18:20:58 +0000
committerdalecurtis@google.com <dalecurtis@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2012-03-14 18:20:58 +0000
commit4aeda7a42266dab9938534fa8b2c027c3a436364 (patch)
tree31e3f98ee8c292c8029e34fc969eacad21527b1f /DEPS
parent0aafdc15e51fd6b695c20572045a2996f23a15c8 (diff)
downloadchromium_src-4aeda7a42266dab9938534fa8b2c027c3a436364.zip
chromium_src-4aeda7a42266dab9938534fa8b2c027c3a436364.tar.gz
chromium_src-4aeda7a42266dab9938534fa8b2c027c3a436364.tar.bz2
Roll deps for ffmpeg security fixes and add new test case.
Includes many upstream h264 fixes as well. ffmpeg_revision: http://src.chromium.org/viewvc/chrome?view=rev&revision=126470 ffmpeg_hash: http://git.chromium.org/gitweb/?p=chromium/third_party/ffmpeg.git;a=commit;h=ddcf259fa5fb83159d441bd71f54e617e2a4afd3 Includes the following patches: ddcf259 Update Windows binaries to pull in latest fixes. 707d08c h264: Fix invalid interlaced/progressive MB combinations for direct mode prediction. d6e7e28 h264: error out on invalid bitdepth. 8b29ceb h264: prevent overreads in intra PCM decoding. 9d8f016 h264: fix mmxext chroma deblock to use correct TC values. 8052a84 h264: change underread for 10bit QPEL to overread. f476438 h264: don't use redzone in loopfilter on win64. 400de19 Revert commit c98c1f434 due to webm regression. ed45601 Move struc FFTContext below SECTION_RODATA d881f5b Reverts removal of problen check in a2edf3dd. BUG=117912 TEST=ffmpeg_regression_tests Review URL: https://chromiumcodereview.appspot.com/9693060 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@126683 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'DEPS')
-rw-r--r--DEPS4
1 files changed, 2 insertions, 2 deletions
diff --git a/DEPS b/DEPS
index 6056906..5eeebc0 100644
--- a/DEPS
+++ b/DEPS
@@ -46,8 +46,8 @@ vars = {
# These two FFmpeg variables must be updated together. One is used for SVN
# checkouts and the other for Git checkouts.
- "ffmpeg_revision": "125946",
- "ffmpeg_hash": "d70dcd6cce182fe5fe1ce47561e17890a1bae2b9",
+ "ffmpeg_revision": "126470",
+ "ffmpeg_hash": "ddcf259fa5fb83159d441bd71f54e617e2a4afd3",
"sfntly_revision": "128",
"skia_revision": "3381",