From patchwork Sat Oct 5 04:44:16 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gyan Doshi X-Patchwork-Id: 52060 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:938f:0:b0:48e:c0f8:d0de with SMTP id z15csp803728vqg; Fri, 4 Oct 2024 21:44:48 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCWEEtgLvR8pb8V0bnfEMBEvPEuC6CcWM9JpXM419dc132G8Tl7DoSYitp6oQsUdQPcL1YS5c7WbQgKwTILenuL/@gmail.com X-Google-Smtp-Source: AGHT+IEzW7niHYb/a/xAeShNewksZTWlwO6zxm8WCWOxOGutVJkWEGyap2jjgYyohYlWLuYQ22DC X-Received: by 2002:a17:907:3f27:b0:a8d:4b02:333c with SMTP id a640c23a62f3a-a991bd42103mr209093666b.7.1728103488075; Fri, 04 Oct 2024 21:44:48 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1728103488; cv=none; d=google.com; s=arc-20240605; b=DzqYHIU+H/lqzZenkpg+g7TqgE8Lifjq5L8TYp2lEK+B9OSZTpUGgrqAMHWqrCzLxY mOPXsCADME/UR5H8oVf45NVW3zG5I+Zxy+2vc6lXwWb4qZ0LEpeKQerik4jLrsuvBCnl qEe7ODdZ9t9OYeQvE0E1y5bHmAKUmPuz75w6w/0n5oNGEo8LB6AcwumtL4XHVpvbXmd7 AJNbvG7QT4UfvyRO3vCBm5qQf91UnwJtn4dFB9FzeUDJlHNqOcsKfRubwUFC5v46Jkzc yG050Feo3lrTEQFOjX1MzMOMyERP0QUQDCHQref2SnxW5ZaKyhpfxkL78M8w2womRW3O 4wKQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:message-id:date:to:from :delivered-to; bh=m2Hd0va3xbm+I5FCy7D9ZdG2Q+jINyk5OLJ0X2DA2LU=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=fUHP8Y1zF4eEdTjAuZCqDGANdrcw9JsEX4t1ByBxo/Bc4Q4tVGa9JH71/v2kutjn+R lhkpFndgExu0IGOWoUt3x+ZutNKF16Y80DPn2riJZtpZADCfzGBj5gUyfRHYNfvbuO7n 3UBBEwsEfISl0EXBly6jxBpMdDlLRapT9u+9uNk/tDiY1AxvQTJDGoTOg3agE8vyTMYK lrha54xDgk+M/WXqYFjlNY91HKjwBFFyksdmIp5FguUYhf1PzBQu/fOsRGybn0/cCkTQ UiMlmgB2iCmQli0Q8I4WN6dzz9miRePaKGKNo6QsgoEMfKbHm0AxS4jTVTjs+CY1OKAc Pqdg==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id a640c23a62f3a-a99370ba1a1si55979666b.973.2024.10.04.21.44.47; Fri, 04 Oct 2024 21:44:48 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 9911668BECE; Sat, 5 Oct 2024 07:44:43 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mout-p-101.mailbox.org (mout-p-101.mailbox.org [80.241.56.151]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 662B868BECE for ; Sat, 5 Oct 2024 07:44:36 +0300 (EEST) Received: from smtp102.mailbox.org (smtp102.mailbox.org [10.196.197.102]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mout-p-101.mailbox.org (Postfix) with ESMTPS id 4XLCW52Mz8z9t6q for ; Sat, 5 Oct 2024 06:44:33 +0200 (CEST) From: Gyan Doshi To: ffmpeg-devel@ffmpeg.org Date: Sat, 5 Oct 2024 10:14:16 +0530 Message-ID: <20241005044416.801-1-ffmpeg@gyani.pro> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] avcodec/libx265: unbreak build for X265_BUILD >= 213 X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: pAA2mzNYQHSU 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. --- 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;