[FFmpeg-devel] [PATCH] avcodec/libx265: unbreak build for X265_BUILD >= 213

[Gyan Doshi]

On 2024-10-05 06:21 pm, James Almer wrote:
> On 10/5/2024 1:44 AM, Gyan Doshi wrote:
>> 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
>
> And they did it after they tagged a release...
>
>>
>> Updated our wrapper guards to unbreak build again.
>> ---
>>   libavcodec/libx265.c | 6 +++---
>>   1 file changed, 3 insertions(+), 3 deletions(-)
>>
>> diff --git a/libavcodec/libx265.c b/libavcodec/libx265.c
>> index 513f473307..63cc497f83 100644
>> --- a/libavcodec/libx265.c
>> +++ b/libavcodec/libx265.c
>> @@ -661,7 +661,7 @@ static int libx265_encode_frame(AVCodecContext 
>> *avctx, AVPacket *pkt,
>>   {
>>       libx265Context *ctx = avctx->priv_data;
>>       x265_picture x265pic;
>> -#if X265_BUILD >= 210
>> +#if (X265_BUILD >= 210) && (X265_BUILD < 213)
>>       x265_picture x265pic_layers_out[MAX_SCALABLE_LAYERS];
>>       x265_picture* x265pic_lyrptr_out[MAX_SCALABLE_LAYERS];
>>   #else
>> @@ -805,7 +805,7 @@ static int libx265_encode_frame(AVCodecContext 
>> *avctx, AVPacket *pkt,
>>   #endif
>>       }
>>   -#if X265_BUILD >= 210
>> +#if (X265_BUILD >= 210) && (X265_BUILD < 213)
>>       for (i = 0; i < MAX_SCALABLE_LAYERS; i++)
>>           x265pic_lyrptr_out[i] = &x265pic_layers_out[i];
>>   @@ -844,7 +844,7 @@ static int libx265_encode_frame(AVCodecContext 
>> *avctx, AVPacket *pkt,
>>               pkt->flags |= AV_PKT_FLAG_KEY;
>>       }
>>   -#if X265_BUILD >= 210
>> +#if (X265_BUILD >= 210) && (X265_BUILD < 213)
>>       x265pic_out = x265pic_lyrptr_out[0];
>>   #else
>>       x265pic_out = &x265pic_solo_out;
>
> Ok. Please backport to release/7.1 too.

Thanks.

Pushed to master and 7.1 as

099f88b8641dfc299f3896d17d9addc5b9ae7799
63f5c007a7da69248f664c988398204c21eac7cf


Regards,
Gyan