GitHub Actions: fix Fedora CMake build #910
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
I don't know if MythTV uses RTP or RTSP, so those still use our modified mpegts-mythtv.h. |
This reduces the changes relative to upstream FFmpeg.
This reduces the changes relative to upstream FFmpeg in mpegts.* and makes it clearer where in FFmpeg our version is used. The impetus for this change is that the GitHub Actions Fedora CMake builder is now building libavdevice/iec61883.c which includes and uses FFmpeg’s mpegts.h, causing it to not compile.
Needed to run Qt moc on it. Causes ld to fail otherwise. This should have been added in db8c584
ulmus-scott
force-pushed
the
GitHubActions-FedoraCMake
branch
from
62b3e76 to
ce41d1b
Compare
|
I rebased onto master without change to force a rebuild. |
|
Thanks for these fixes, I need them also to compile on ArchLinux. |
|
Regarding |
libavformat/mpegts.h is now unmodified.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
The GitHub Actions Fedora CMake builder is now building libavdevice/iec61883.c which includes and uses FFmpeg’s mpegts.h, causing it to not compile.
Checklist