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

[Gyan Doshi]

ffmpeg | branch: release/6.1 | Gyan Doshi <ffmpeg at gyani.pro> | Sat Oct  5 10:26:31 2024 +0530| [4571c80b404fef48d649c71a059d8d00c5275c95] | committer: Timo Rothenpieler

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.

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=4571c80b404fef48d649c71a059d8d00c5275c95
---

 libavcodec/libx265.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/libavcodec/libx265.c b/libavcodec/libx265.c
index 29fc26eab4..4bf7f7a83d 100644
--- a/libavcodec/libx265.c
+++ b/libavcodec/libx265.c
@@ -581,7 +581,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
@@ -710,7 +710,7 @@ FF_ENABLE_DEPRECATION_WARNINGS
         }
     }
 
-#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];
 
@@ -749,7 +749,7 @@ FF_ENABLE_DEPRECATION_WARNINGS
             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;