From patchwork Thu Nov 3 14:20:09 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhao Zhili X-Patchwork-Id: 39142 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:999a:b0:a4:2148:650a with SMTP id ve26csp572681pzb; Thu, 3 Nov 2022 07:20:27 -0700 (PDT) X-Google-Smtp-Source: AMsMyM4eEAXQzLzEPAflf41Jw73bAgNct+GcGhSOWN6y3ze6zNzSIsxkubJ1P/S+/vcooXpMn7YZ X-Received: by 2002:a17:907:16aa:b0:6fe:91d5:18d2 with SMTP id hc42-20020a17090716aa00b006fe91d518d2mr28986073ejc.190.1667485227580; Thu, 03 Nov 2022 07:20:27 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1667485227; cv=none; d=google.com; s=arc-20160816; b=zMJU3zsbS/HUuAVtTmzp9cTtLtiF048lM2+VKEMZaiOWhECqWH0+7slR48xZXDKKoA ZwJ5HKddg8DFIJJnadhbypML+Hg0a3bNbrN3KvOJ8G6DG7Z0/JdDYLq6W2Owb+tjZZas LUdwwIFvgcjwvkd0fDO7DBuCHrGXdF++uWmBmTjs7nR7zwfO+C20H9J9bmIqceDQpKIJ tGP8u5zi5By9Fs/8DsRaQ5/1lbtcecKhVcAOqeDQ3xP+A8+en/dL6hwkGEmhV4vCCXnf ylXXZMQuagPd9d4yVFOo9VAhMF+XjXqa5Ok0Aso0r5NblVasNdzduPE8NcpjA8V1vT/b Jzlg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:mime-version:references:in-reply-to:date :to:from:message-id:dkim-signature:delivered-to; bh=Aj2u4k+xmMmyISvbwYTyAtBbu2PnxjFDatsgVkp4Dus=; b=TbIpoU3D3uVJAhDqt3XueMQNXOCZT+mM82LG1P5iXw8XaeSR70pc0XdOYm1Wtl+Koy i/x9JAy+vSNYinyZL+qRCNqs5XXBH9ZhvR2HtduWqoIm0Xrmxl8sTY1CRIqyV++vvlmF LTlP2GwgXpeWONqVwn8hQTwoIEaIqh3i12qjMdu9dgjWMWZewEuHRAC4Crp4pC6hJzg0 gVB7mKV2w32iNnNg37y9N1XbckA/eFEfcKblwT8lXgIFIvGgaq0qNklpcN8/TmRKFZFo 6Fe2yPlQ1PNLIPOdOnURu6MgGbsqnB+wZj7HEXIYL3jUXiXYX+4G/Qlndxte5yfML8kr SsIA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@foxmail.com header.s=s201512 header.b=AArPGiZD; 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; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=foxmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id t18-20020a1709063e5200b007adb8d724a7si976392eji.928.2022.11.03.07.20.26; Thu, 03 Nov 2022 07:20:27 -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; dkim=neutral (body hash did not verify) header.i=@foxmail.com header.s=s201512 header.b=AArPGiZD; 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; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=foxmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 50AAC68BF9B; Thu, 3 Nov 2022 16:20:24 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from out162-62-58-211.mail.qq.com (out162-62-58-211.mail.qq.com [162.62.58.211]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id B1FD968BF6F for ; Thu, 3 Nov 2022 16:20:16 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foxmail.com; s=s201512; t=1667485211; bh=+AYV0o9Aat1opGT34wL8PmznaPZRN+4a0i6WVAj07mM=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=AArPGiZDUVOo3oxrrdZNCEKoD0+jCo8tZsTcCVBj013nvo+Fum3B5TfWOpUcEE8MN qDfAynFKau2TYLiDTdcKN8amyGIiPSVE+lZdi8EH3UrNCqzo8KO6VHRzHeLmhBkud6 5W3frJOAQFmtfKe7Geiope1MwB8PbsYeaSN7owbA= Received: from ZHILIZHAO-PC4.localdomain ([121.35.185.192]) by newxmesmtplogicsvrszb9-0.qq.com (NewEsmtp) with SMTP id 50AB4AC7; Thu, 03 Nov 2022 22:20:10 +0800 X-QQ-mid: xmsmtpt1667485210tss5rw0ac Message-ID: X-QQ-XMAILINFO: MIAHdi1iQo+zSFe4+vh+cR6747snQ3fUiX4q95F45tWrvBHszLjYrZ/fU6IZy5 JJaKw0l6+py+vqpsnQN3gIFMS5dqVibnJepbKFU8xCzulKw/G96sufJbswUXdr9G85atvD7BVinB QKGuwv1mxtiPrk7AOsmOkeuerZKsqaQ64z5nReKF3E82GN3JCpmUNIwSq0sS5KXUcHGTAltLJ8SQ aN27O+qlR6TZJGQluP47lwYdyLEASkSuND4QTf5QBdP2kUvNtB/95ekB4kTE7CmiNAUfd25Ti+Gf 8q7n8DWz/md7gfkgG35/rFqNMnU3ize93bnNaAR5sxngtyKyTyP4rHf7HLFpfrCVyODOVzeRO9P/ 9Tgvph0vvosxMvdzForI4mzmBP3eNun6xk1+la9KY7U/c1hOhKtreH7pathqms2//pwzW4xdGFTo i/00t1fzRJPp/xOHs2wLcEHleNVg1pP7BW7MHyBu0iniM+edA37ajOLufO3q0oIU+ooKe4HEsXM0 VYuKjjUvgyS2m4Z38TkCBukRTUuDuUfM4SZ4CQH/sAT43Z8++JIUnEvrDaMaYLfbmpVo0r89yPKf CKiMdGdt2p7OwcM7vXmop8hWP37E0ohGkuABw/8mTzXpLdkOfDcHczumClyly1qZlpg6riqm5WLp vmCajypN+2y1zAJrSdiT+5b/bmYD1Ow6tSr2QcXW5wNFSz4Dynvt3FWgnwPd0URJQj5IlyR6Demc pfbxGezLYZ6iWF+ZHy1JbQpaa/Vl0ZqZ5zRSVT/Fa9mzGoTLW7ig/nP7SsOsDWcubxrX9o6ChM7Y K7/VirawakTpkfgEnXN3Gslr28exuAIf+4Oidg+LG7yv9RMqJKcrpvH3rWTqwXHrPxdJKnNyJswk WsHTy600ePTG6Q7A6KmB8R15CMbGCLFEgcOxvSrLAonULFnQqi3/hTBuKspsYrxIaBFOUrazz954 yHo4o1uKssUV3l6Hi66SgG5l5wBceScizMx2rN084= From: Zhao Zhili To: ffmpeg-devel@ffmpeg.org Date: Thu, 3 Nov 2022 22:20:09 +0800 X-OQ-MSGID: <20221103142009.26342-1-quinkblack@foxmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] avcodec/libx265: fix build error 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 Cc: Zhao Zhili Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: KN6PoC//f3WG From: Zhao Zhili x265_sei is available since X265_BUILD 88. Bump required version to 89 to fix the regression from commit 1f585030137, and remove a conditional compilation. Signed-off-by: Zhao Zhili --- configure | 2 +- libavcodec/libx265.c | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/configure b/configure index 2bcdf18a57..09d51002e3 100755 --- a/configure +++ b/configure @@ -6736,7 +6736,7 @@ enabled libx264 && require_pkg_config libx264 x264 "stdint.h x264.h" x require_cpp_condition libx264 x264.h "X264_BUILD >= 158"; } && check_cpp_condition libx262 x264.h "X264_MPEG2" enabled libx265 && require_pkg_config libx265 x265 x265.h x265_api_get && - require_cpp_condition libx265 x265.h "X265_BUILD >= 70" + require_cpp_condition libx265 x265.h "X265_BUILD >= 89" enabled libxavs && require libxavs "stdint.h xavs.h" xavs_encoder_encode "-lxavs $pthreads_extralibs $libm_extralibs" enabled libxavs2 && require_pkg_config libxavs2 "xavs2 >= 1.3.0" "stdint.h xavs2.h" xavs2_api_get enabled libxvid && require libxvid xvid.h xvid_global -lxvidcore diff --git a/libavcodec/libx265.c b/libavcodec/libx265.c index 4aa96e1f2d..555b5e26d8 100644 --- a/libavcodec/libx265.c +++ b/libavcodec/libx265.c @@ -293,7 +293,6 @@ static av_cold int libx265_encode_init(AVCodecContext *avctx) return ret; } -#if X265_BUILD >= 89 if (avctx->qmin >= 0) { ret = libx265_param_parse_int(avctx, "qpmin", avctx->qmin); if (ret < 0) @@ -304,7 +303,6 @@ static av_cold int libx265_encode_init(AVCodecContext *avctx) if (ret < 0) return ret; } -#endif if (avctx->max_qdiff >= 0) { ret = libx265_param_parse_int(avctx, "qpstep", avctx->max_qdiff); if (ret < 0)