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.

Sign up for GitHub

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

Jump to bottom

Bump dav1d to 0.10.1 #2047

Merged
merged 3 commits into from
Nov 3, 2023
Merged

Bump dav1d to 0.10.1 #2047

merged 3 commits into from
Nov 3, 2023

Conversation

FlareFlo
Copy link
Contributor

@FlareFlo FlareFlo commented Nov 3, 2023

Linked issue: #2044

@fintelia
Copy link
Contributor

fintelia commented Nov 3, 2023

Could you rebase? Seems that git thinks this PR conflicts with #2048

@FlareFlo
Copy link
Contributor Author

FlareFlo commented Nov 3, 2023

Looks like i accidentally removed the dcp line, ill get that patched

@FlareFlo
Copy link
Contributor Author

FlareFlo commented Nov 3, 2023

Seems git did not like the two dependencies being right next to each other, and the out-of-order merging into image-rs:master

@fintelia fintelia merged commit f1cdb3b into image-rs:master Nov 3, 2023
35 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@fintelia fintelia fintelia approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@FlareFlo @fintelia