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

ffmpeg 7.1 support #750

Merged
merged 2 commits into from
Jan 8, 2025
Merged

ffmpeg 7.1 support #750

merged 2 commits into from
Jan 8, 2025

Conversation

okias
Copy link
Contributor

@okias okias commented Nov 26, 2024 •
edited
Loading

Works. There are issues with the tests, but that's unrelated to the fixes.

@okias okias force-pushed the ffmpeg-new branch 2 times, most recently from f6d3794 to 19f8778 Compare November 26, 2024 12:45
@okias okias force-pushed the ffmpeg-new branch 2 times, most recently from 55d3f42 to 195be25 Compare November 27, 2024 04:58
@okias okias changed the title wip! ffmpeg 7.0+ support ffmpeg 7.0+ support Dec 12, 2024
@okias okias changed the title ffmpeg 7.0+ support ffmpeg 7.1 support Dec 12, 2024
@okias okias requested a review from dracc December 12, 2024 03:50
@okias okias marked this pull request as ready for review December 12, 2024 03:51
@dracc
Copy link

dracc commented Jan 7, 2025

This PR fixes building on my machine running Debian Testing ("Trixie").
However, debug mode is silent and "Start New Game" gives some traffic noise but no visuals.
Given that building is broken without these fixes, I'm not sure what the status is on current master.

@Lihis
Copy link
Collaborator

Lihis commented Jan 8, 2025

This PR fixes building on my machine running Debian Testing ("Trixie"). However, debug mode is silent and "Start New Game" gives some traffic noise but no visuals. Given that building is broken without these fixes, I'm not sure what the status is on current master.

The PR branch is missing e20356b, so rebasing against main should fix the starting of new game.

@Lihis Lihis mentioned this pull request Jan 8, 2025
Merged
@okias
Copy link
Contributor Author

okias commented Jan 8, 2025

@dracc can you confirm it's regression against previous state without the PR?

okias added 2 commits January 8, 2025 16:05
@okias
engine: drop old ffmpeg support (~Ubuntu 14.04)
51806f4 
It's 10 years since the release.

Signed-off-by: David Heidelberg <david@ixit.cz>
@okias
wip! engine: ffmpeg 7.0 support
2e79b75 
Signed-off-by: David Heidelberg <david@ixit.cz>
dracc
dracc approved these changes Jan 8, 2025
View reviewed changes
Copy link

@dracc dracc left a comment

Choose a reason for hiding this comment

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

Since the rebase this builds and runs as expected on my machine. Thank you!

@Lihis Lihis merged commit d758675 into rwengine:main Jan 8, 2025
1 check failed
@okias okias deleted the ffmpeg-new branch January 8, 2025 21:25
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@dracc dracc dracc 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.
3 participants
@okias @dracc @Lihis