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

Sk/merge upstream #13

Merged
merged 79 commits into from
Feb 6, 2025
Merged

Sk/merge upstream #13

merged 79 commits into from
Feb 6, 2025

Conversation

srikanth-descript
Copy link

No description provided.

scriptorian and others added 30 commits February 25, 2022 13:15
Bumps [minimist](https://github.com/substack/minimist) from 1.2.5 to 1.2.6.
- [Release notes](https://github.com/substack/minimist/releases)
- [Commits](https://github.com/substack/minimist/compare/1.2.5...1.2.6)

---
updated-dependencies:
- dependency-name: minimist
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <[email protected]>
…arn/minimist-1.2.6

Bump minimist from 1.2.5 to 1.2.6
Allow to pass hw device to filters and allocate hw frame contexts
Use pkg-config on linux to resolve ffmpeg link dependencies
# Conflicts:
#	binding.gyp
#	package-lock.json
#	package.json
Copy link
Collaborator

@marcello3d marcello3d left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

didn't really look at this but trying to close out my review queue :)

@srikanth-descript srikanth-descript merged commit d27191d into master Feb 6, 2025
6 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Development

Successfully merging this pull request may close these issues.

7 participants