Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(468)

Issue 591783002: Roll FFmpeg DEPS. (Closed)

Created:
6 years, 3 months ago by jrummell
Modified:
6 years, 3 months ago
Reviewers:
DaleCurtis, wolenetz
CC:
chromium-reviews
Base URL:
https://chromium.googlesource.com/chromium/src.git@master
Project:
chromium
Visibility:
Public.

Description

Merge ffmpeg for M39 from upstream 5e3da256184e13502b3428f94e180888436d157b around 10 Sep 2014. BUG=none TEST=cq Committed: https://crrev.com/eab98731cc2a2b23796a45ad06ed2496224e1897 Cr-Commit-Position: refs/heads/master@{#296314}

Patch Set 1 #

Patch Set 2 : checklicense #

Patch Set 3 : switch to master #

Patch Set 4 : next rev #

Unified diffs Side-by-side diffs Delta from patch set Stats (+1 line, -1 line) Patch
M DEPS View 1 2 3 1 chunk +1 line, -1 line 0 comments Download

Messages

Total messages: 24 (5 generated)
jrummell
PTAL.
6 years, 3 months ago (2014-09-20 01:09:42 UTC) #2
DaleCurtis
Looks like you have some checklicenses failures on the bots, but all else looks good. ...
6 years, 3 months ago (2014-09-22 17:12:09 UTC) #3
wolenetz
looks good for trying merge-m39 on bots; landing will need to include updated DEPS for ...
6 years, 3 months ago (2014-09-22 19:34:27 UTC) #4
jrummell
Updating to include checklicenses change. phajdan.jr@, please verify the change in checklicenses.py.
6 years, 3 months ago (2014-09-23 01:53:32 UTC) #6
DaleCurtis
Bots all look good, lets merge into master now.
6 years, 3 months ago (2014-09-23 17:10:48 UTC) #7
jrummell
Updated to use ffmpeg hash from master branch.
6 years, 3 months ago (2014-09-23 17:50:21 UTC) #8
DaleCurtis
lgtm
6 years, 3 months ago (2014-09-23 17:53:59 UTC) #9
jrummell
+thestig@ for OWNERS review of checklicenses.py
6 years, 3 months ago (2014-09-23 20:57:32 UTC) #11
Lei Zhang
I'm not a lawyercat so I am not qualified to say whether ffmpeg with GPLv3 ...
6 years, 3 months ago (2014-09-23 21:48:07 UTC) #12
DaleCurtis
Is this really a lawyercat question? We already have many other third_party libraries w/ GPLv3.
6 years, 3 months ago (2014-09-23 21:49:18 UTC) #13
Lei Zhang
On 2014/09/23 21:49:18, DaleCurtis wrote: > Is this really a lawyercat question? We already have ...
6 years, 3 months ago (2014-09-23 21:52:13 UTC) #14
DaleCurtis
Hmm, I think for now we'll just delete the one file which is having issues ...
6 years, 3 months ago (2014-09-23 21:55:44 UTC) #15
Lei Zhang
On 2014/09/23 21:55:44, DaleCurtis wrote: > Hmm, I think for now we'll just delete the ...
6 years, 3 months ago (2014-09-23 22:09:16 UTC) #16
DaleCurtis
John can you update the CL? efa2e5d00c218551242fa50931cd81332359a509 is the new hash.
6 years, 3 months ago (2014-09-23 22:18:37 UTC) #17
jrummell
Updated to new hash that avoids new license requirement.
6 years, 3 months ago (2014-09-23 22:52:21 UTC) #19
commit-bot: I haz the power
CQ is trying da patch. Follow status at https://chromium-cq-status.appspot.com/patch-status/591783002/60001
6 years, 3 months ago (2014-09-23 22:55:56 UTC) #21
commit-bot: I haz the power
Committed patchset #4 (id:60001) as d564b451e1e0284d42fffbf7c3726479f39e19f5
6 years, 3 months ago (2014-09-24 00:23:55 UTC) #22
commit-bot: I haz the power
Patchset 4 (id:??) landed as https://crrev.com/eab98731cc2a2b23796a45ad06ed2496224e1897 Cr-Commit-Position: refs/heads/master@{#296314}
6 years, 3 months ago (2014-09-24 00:24:29 UTC) #23
wolenetz
6 years, 3 months ago (2014-09-24 19:48:25 UTC) #24
Message was sent while issue was closed.
belated lgtm.

Powered by Google App Engine
This is Rietveld 408576698