summaryrefslogtreecommitdiffstats
path: root/DEPS
diff options
context:
space:
mode:
authordalecurtis@google.com <dalecurtis@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2012-05-11 20:43:39 +0000
committerdalecurtis@google.com <dalecurtis@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2012-05-11 20:43:39 +0000
commit0c419551acb73f5c1c1108fbea1787a511342e66 (patch)
treed3ee4403c0bacd714ff0c1978812e410986446cc /DEPS
parentf54bd1779f114be16dd4b4007f1ed68c2041cc68 (diff)
downloadchromium_src-0c419551acb73f5c1c1108fbea1787a511342e66.zip
chromium_src-0c419551acb73f5c1c1108fbea1787a511342e66.tar.gz
chromium_src-0c419551acb73f5c1c1108fbea1787a511342e66.tar.bz2
Roll FFmpeg DEPS to pick up non-code changes.
BUG=none TEST=mac build. TBR=thakis Review URL: https://chromiumcodereview.appspot.com/10332123 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@136654 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 9ba8641..91fbd8c 100644
--- a/DEPS
+++ b/DEPS
@@ -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": "135548",
- "ffmpeg_hash": "a58fe277c016ec842a82a269e7162fb1e8135ca1",
+ "ffmpeg_revision": "136643",
+ "ffmpeg_hash": "5938434ce9f24585e3f1ee4016f85ac3e837ee57",
"sfntly_revision": "128",
"skia_revision": "3902",