diff options
| author | jrummell <jrummell@chromium.org> | 2014-09-23 17:23:25 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2014-09-24 00:23:59 +0000 |
| commit | eab98731cc2a2b23796a45ad06ed2496224e1897 (patch) | |
| tree | 689378eeb9f5b5db75ffb5679792412790d97c78 | |
| parent | 4dd965f2a83377ba97da0ca49182466e8d2fec0f (diff) | |
| download | chromium_src-eab98731cc2a2b23796a45ad06ed2496224e1897.zip chromium_src-eab98731cc2a2b23796a45ad06ed2496224e1897.tar.gz chromium_src-eab98731cc2a2b23796a45ad06ed2496224e1897.tar.bz2 | |
Merge ffmpeg for M39 from upstream 5e3da256184e13502b3428f94e180888436d157b around 10 Sep 2014.
BUG=none
TEST=cq
Review URL: https://codereview.chromium.org/591783002
Cr-Commit-Position: refs/heads/master@{#296314}
| -rw-r--r-- | DEPS | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -211,7 +211,7 @@ deps = { Var('chromium_git') + '/chromium/deps/libvpx.git' + '@' + Var('libvpx_revision'), 'src/third_party/ffmpeg': - Var('chromium_git') + '/chromium/third_party/ffmpeg.git' + '@' + '62512b980ce409fda75037e893a0fe0f5be30326', + Var('chromium_git') + '/chromium/third_party/ffmpeg.git' + '@' + 'efa2e5d00c218551242fa50931cd81332359a509', 'src/third_party/libjingle/source/talk': Var('chromium_git') + '/external/webrtc/trunk/talk.git' + '@' + 'b25f2cd3bd9b8444d2a1d48ca26e2721b42c78e1', |