summaryrefslogtreecommitdiffstats
path: root/DEPS
diff options
context:
space:
mode:
authordalecurtis@chromium.org <dalecurtis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-09-07 19:07:49 +0000
committerdalecurtis@chromium.org <dalecurtis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-09-07 19:07:49 +0000
commit223c6e879df3ff06f497bd65bcc0c4ab381ec546 (patch)
tree8cfba9946f4eabe24bf668ffb1a72280fd7423d0 /DEPS
parent60d934797efb983bc84c436610c6f199dba67481 (diff)
downloadchromium_src-223c6e879df3ff06f497bd65bcc0c4ab381ec546.zip
chromium_src-223c6e879df3ff06f497bd65bcc0c4ab381ec546.tar.gz
chromium_src-223c6e879df3ff06f497bd65bcc0c4ab381ec546.tar.bz2
Roll ffmpeg DEPS to pick new scripts.
Pulls in: 4a1909e Add signatures for AVIO. 2e2c3ab Add config.h and related files to FFmpeg for Mac 64-bit build. BUG=none TEST=trybots TBR=scherkus Review URL: https://chromiumcodereview.appspot.com/10928056 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@155440 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 8ca713f..00610da 100644
--- a/DEPS
+++ b/DEPS
@@ -25,8 +25,8 @@ vars = {
# These two FFmpeg variables must be updated together. One is used for SVN
# checkouts and the other for Git checkouts.
- "ffmpeg_revision": "150165",
- "ffmpeg_hash": "2079ffae30f8da6c6eed985cce00e04c31b40888",
+ "ffmpeg_revision": "155401",
+ "ffmpeg_hash": "4a1909e22211b340ee859a8c9d12e8825fe499b7",
"sfntly_revision": "134",
"skia_revision": "5427",