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}

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}
eab98731 · jrummell · Commit bot · 4dd965f2 · eab98731
Commit eab98731 authored Sep 23, 2014 by jrummell Committed by Commit bot Sep 24, 2014
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

DEPS DEPS +1 -1

No files found.
--- a/DEPS
+++ b/DEPS
@@ -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',