Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Cherry pick PR #3172: Import libwebm from Chromium 114 #3307

Merged
merged 4 commits into from
May 21, 2024

Conversation

cobalt-github-releaser-bot
Copy link
Collaborator

Refer to the original PR: #3172

This includes commits to add new subtrees third_party/libwebm and third_party/libwebm/source, and another commit using the library to remove a Cobalt customization in //media.

Note that these should be merged using the "merge" strategy rather than "squash", to preserve the commit history.

b/327449946
b/338100595

Chrome Release Bot (LUCI) and others added 2 commits May 8, 2024 08:00
git-subtree-dir: third_party/libwebm
git-subtree-split: 1759c6ae9316996b9f150c0ce9d0ca78a3d15c02
Init ebml_header_size_ to 0. Avoids MSan issues when tests that never
mux samples call Finalize() on Segment.

git-subtree-dir: third_party/libwebm/source
git-subtree-split: e4fbea0c9751ae8aa86629b197a28d8276a2b0da
@osagie98
Copy link
Contributor

Won't merge this, a squash commit will erase commit history. I'll create a separate pull request with the proper commit history.

@osagie98 osagie98 closed this May 21, 2024
@osagie98 osagie98 reopened this May 21, 2024
Change-Id: I620d6a69cee11d230d277126db73464ce1c9cfbb
@osagie98 osagie98 force-pushed the cherry-pick-25.lts.1+-3172 branch from 8792e01 to 97cadca Compare May 21, 2024 19:17
@osagie98 osagie98 enabled auto-merge May 21, 2024 19:32
@osagie98 osagie98 merged commit 7923340 into 25.lts.1+ May 21, 2024
300 of 304 checks passed
@osagie98 osagie98 deleted the cherry-pick-25.lts.1+-3172 branch May 21, 2024 20:02
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants