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

Fix build of FFmpeg with libx265 X265_BUILD >= 210 and X265_BUILD < 213 (fixes/34) #970

Open
wants to merge 2 commits into
base: fixes/34
Choose a base branch
from
Open

Fix build of FFmpeg with libx265 X265_BUILD >= 210 and X265_BUILD < 213 (fixes/34) #970

wants to merge 2 commits into from

Commits on Nov 12, 2024

  1. lavc/libx265: unbreak build for X265_BUILD >= 210 

    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)
    @GyanD @ulmus-scott
    GyanD authored and ulmus-scott committed Nov 12, 2024
    Configuration menu
    Copy the full SHA
    cfafa81 View commit details
    Browse the repository at this point in the history

  2. avcodec/libx265: unbreak build for X265_BUILD >= 213 

    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)
    @GyanD @ulmus-scott
    GyanD authored and ulmus-scott committed Nov 12, 2024
    Configuration menu
    Copy the full SHA
    58e2225 View commit details
    Browse the repository at this point in the history