RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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.
This commit is contained in:
Gyan Doshi 2024-10-05 10:08:31 +05:30 committed by Timo Rothenpieler
parent 35f906521e
commit 769c36b013
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libavcodec/libx265.c
View File

@ -575,7 +575,7 @@ static int libx265_encode_frame(AVCodecContext *avctx, AVPacket *pkt,
{ {
libx265Context *ctx = avctx->priv_data; libx265Context *ctx = avctx->priv_data;
x265_picture x265pic; 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_layers_out[MAX_SCALABLE_LAYERS];
x265_picture* x265pic_lyrptr_out[MAX_SCALABLE_LAYERS]; x265_picture* x265pic_lyrptr_out[MAX_SCALABLE_LAYERS];
#else #else
@ -704,7 +704,7 @@ FF_ENABLE_DEPRECATION_WARNINGS
} }
} }
#if X265_BUILD >= 210 #if (X265_BUILD >= 210) && (X265_BUILD < 213)
for (i = 0; i < MAX_SCALABLE_LAYERS; i++) for (i = 0; i < MAX_SCALABLE_LAYERS; i++)
x265pic_lyrptr_out[i] = &x265pic_layers_out[i]; x265pic_lyrptr_out[i] = &x265pic_layers_out[i];
@ -743,7 +743,7 @@ FF_ENABLE_DEPRECATION_WARNINGS
pkt->flags |= AV_PKT_FLAG_KEY; pkt->flags |= AV_PKT_FLAG_KEY;
} }
#if X265_BUILD >= 210 #if (X265_BUILD >= 210) && (X265_BUILD < 213)
x265pic_out = x265pic_lyrptr_out[0]; x265pic_out = x265pic_lyrptr_out[0];
#else #else
x265pic_out = &x265pic_solo_out; x265pic_out = &x265pic_solo_out;