Commit b46a672f authored by wolenetz's avatar wolenetz Committed by Commit bot

Roll src/third_party/ffmpeg/ 26be2ced9..f309edd78 (1 commit).

https://chromium.googlesource.com/chromium/third_party/ffmpeg.git/+log/26be2ced9076..f309edd7828e

$ git log 26be2ced9..f309edd78 --date=short --no-merges --format='%ad %ae %s'
2016-12-09 wolenetz A couple cherry picks from upstream to fix issue 670190

TBR=dalecurtis@chromium.org
BUG=670190

Review-Url: https://codereview.chromium.org/2567533003
Cr-Commit-Position: refs/heads/master@{#437988}
parent cd3e789d
...@@ -201,7 +201,7 @@ deps = { ...@@ -201,7 +201,7 @@ deps = {
Var('chromium_git') + '/webm/libvpx.git' + '@' + 'd7f1d60c51b47f6d22be919362caad09469a058b', Var('chromium_git') + '/webm/libvpx.git' + '@' + 'd7f1d60c51b47f6d22be919362caad09469a058b',
'src/third_party/ffmpeg': 'src/third_party/ffmpeg':
Var('chromium_git') + '/chromium/third_party/ffmpeg.git' + '@' + '26be2ced90769f25f83b9a613fe3b3e47c1ce4c6', Var('chromium_git') + '/chromium/third_party/ffmpeg.git' + '@' + 'f309edd7828e3ea500c2891187d15926690ddd27',
'src/third_party/usrsctp/usrsctplib': 'src/third_party/usrsctp/usrsctplib':
Var('chromium_git') + '/external/github.com/sctplab/usrsctp' + '@' + '7f9228152ab3d70e6848cc9c67389a0d4218740e', Var('chromium_git') + '/external/github.com/sctplab/usrsctp' + '@' + '7f9228152ab3d70e6848cc9c67389a0d4218740e',
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment