Commit 099b87a6 authored by Thomas Guilbert's avatar Thomas Guilbert Committed by Commit Bot

Roll src/third_party/ffmpeg/ 68b4dfdbd..252792a1f (2 commits)

It appears that a merge error in 555ef226... undid
the roll in 252792a1ff65deadc4e627e59ce80b...
This is a reland.

https://chromium.googlesource.com/chromium/third_party/ffmpeg.git/+log/68b4dfdbd607..252792a1ff65

$ git log 68b4dfdbd..252792a1f --date=short --no-merges --format='%ad %ae %s'
2019-12-09 tguilbert Fix null pointer addition error
2019-12-06 tguilbert Fix null pointer arithmetic

Created with:
  roll-dep src/third_party/ffmpeg

TBR: tmathmeyer
Bug: 1031252
Change-Id: I4b25092bbc7681578cd0bb6f447788f2936d5a99
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1988726
Commit-Queue: Thomas Guilbert <tguilbert@chromium.org>
Reviewed-by: default avatarThomas Guilbert <tguilbert@chromium.org>
Cr-Commit-Position: refs/heads/master@{#728683}
parent 2635521f
......@@ -929,7 +929,7 @@ deps = {
},
'src/third_party/ffmpeg':
Var('chromium_git') + '/chromium/third_party/ffmpeg.git' + '@' + '68b4dfdbd607fdd33b9b8e3515f039d97677dd1c',
Var('chromium_git') + '/chromium/third_party/ffmpeg.git' + '@' + '252792a1ff65deadc4e627e59ce80b8811c5a5de',
'src/third_party/flac':
Var('chromium_git') + '/chromium/deps/flac.git' + '@' + 'af862024c8c8fa0ae07ced05e89013d881b00596',
......
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