diff options
| author | dalecurtis@google.com <dalecurtis@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-04-24 01:35:08 +0000 |
|---|---|---|
| committer | dalecurtis@google.com <dalecurtis@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-04-24 01:35:08 +0000 |
| commit | 0ddb2acf4cbbb2f909de879729cef6c68fb91bea (patch) | |
| tree | 6e1a705a638a036efdd7870b48c2eafbfb76eb2c /DEPS | |
| parent | b47feba236493f2e541d27e728f8978841353733 (diff) | |
| download | chromium_src-0ddb2acf4cbbb2f909de879729cef6c68fb91bea.zip chromium_src-0ddb2acf4cbbb2f909de879729cef6c68fb91bea.tar.gz chromium_src-0ddb2acf4cbbb2f909de879729cef6c68fb91bea.tar.bz2 | |
Roll DEPS for FFmpeg merge. Shuffle testing.
Lands the FFmpeg roll for M20. Manual test pass completed
by vendors and myself. ASAN/Valgrind testing on Linux/Mac
platforms on ia32/x64. TSAN testing on Windows, no new
traces are expected.
ffmpeg_revision:
http://src.chromium.org/viewvc/chrome?view=rev&revision=133551
ffmpeg_hash:
http://git.chromium.org/gitweb/?p=chromium/third_party/ffmpeg.git;a=commit;h=f8d71c394e071249f26703669baf1093009620d7
List of remaining diff's from upstream:
http://pastebin.com/t5jTbvm9
BUG=49709, 124684
TEST=Video Test Matrix. unittests + asan/valgrind.
Review URL: https://chromiumcodereview.appspot.com/10196006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@133592 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'DEPS')
| -rw-r--r-- | DEPS | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -48,8 +48,8 @@ vars = { # These two FFmpeg variables must be updated together. One is used for SVN # checkouts and the other for Git checkouts. - "ffmpeg_revision": "132717", - "ffmpeg_hash": "69a5a2e6784b5e46326acecf6d5697b63d639ca9", + "ffmpeg_revision": "133551", + "ffmpeg_hash": "f8d71c394e071249f26703669baf1093009620d7", "sfntly_revision": "128", "skia_revision": "3740", |