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

Feature/ffmpeg layouts #314

Merged
merged 4 commits into from
Mar 11, 2024
Merged

Conversation

Euklios
Copy link
Collaborator

@Euklios Euklios commented Mar 11, 2024

Add support for the ffmpeg -layouts info command

…youts

Conflicts:
	src/main/java/net/bramp/ffmpeg/FFmpeg.java
	src/test/java/net/bramp/ffmpeg/FFmpegTest.java
@bramp
Copy link
Owner

bramp commented Mar 11, 2024

This change looks good. Happy to accept, but it seems a conflict is stopping me from rebase/merging

@Euklios
Copy link
Collaborator Author

Euklios commented Mar 11, 2024

@bramp Merged in master and renamed.
I like the new CI.

@Euklios Euklios merged commit 1d11c37 into bramp:master Mar 11, 2024
5 checks passed
@Euklios Euklios deleted the feature/ffmpeg-layouts branch March 11, 2024 20:50
bramp pushed a commit that referenced this pull request Mar 11, 2024
* Implement ffmpeg layouts command
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.

2 participants