Fix build of FFmpeg with libx265 X265_BUILD >= 210 and X265_BUILD < 213 (fixes/34) #970
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
x265 added support for alpha starting with build 210. While doing so, x265_encoder_encode() changed its fifth arg to an array of pointers to x265_picture. This broke building lavc/libx265.c This patch simply unbreaks the build and maintains existing single-layer non-alpha encoding support. Fixes #11130 (cherry picked from commit 1f801dfdb5066aadf0ade9cb5e94d620f33eacdc)
Earlier, x265 made an API change to support alpha and other multiple layer pictures. We added guards to accommodate that in 1f801dfdb5 They have now reverted that API change in https://bitbucket.org/multicoreware/x265_git/commits/78e5b703b1 Updated our wrapper guards to unbreak build again. (cherry picked from commit 099f88b8641dfc299f3896d17d9addc5b9ae7799)
|
please, accept this PR. |
|
FFMpeg 7.1 has been incorporated into branch https://github.com/MythTV/mythtv/tree/devel/ffmpeg-resync . That will be included in master in a week from now unless there are problems. Does that solve the problem you are addressing here? |
|
Yes, absolutely. |
|
@bennettpeter this is for fixes/34 not master. |
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.
Closes #966
I do not recommend applying this to master since the update to FFmpeg 7.1 will fix this.