From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id 6696E4024E for ; Fri, 18 Nov 2022 07:45:23 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id A486468B8C8; Fri, 18 Nov 2022 09:45:19 +0200 (EET) 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 DDAD968B851 for ; Fri, 18 Nov 2022 09:45:12 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foxmail.com; s=s201512; t=1668757508; bh=VRgyWQXnhfCi8T3OXtTelWqlJ1Q5n7SoCRO2rrMoyJU=; h=From:Subject:Date:References:To:In-Reply-To; b=q8pRef19xJ9nBxPfUJbd3++IuSazMeNqlpsEZgJYtK2pW7FzgEdiGO/rJoiI9wMSc V8uVhMWpAICeB+RUfhZGHp02reIc5aAfSCqXSQA58H73us8QAEitNrAm1PpAduvXIv V+6xI72cSlsYg5CaWViQSbuhO+Y+8DGDerENyseQ= Received: from smtpclient.apple ([113.108.77.69]) by newxmesmtplogicsvrsza10-0.qq.com (NewEsmtp) with SMTP id B4703C66; Fri, 18 Nov 2022 15:45:07 +0800 X-QQ-mid: xmsmtpt1668757507tmpuibjsn Message-ID: X-QQ-XMAILINFO: NK7mH5+t7Gn7cyEXNrE08xWbbgnRlhRE70efYNWEyOho1U8pyp+mzf46PFELdQ lC62rqKvxwU1W7pOQRVWQwy/Ip9RLbva/EzahRzCKUpWO2OXBWSG+2SBPR2wWTECZs/XfBz84qHI lH4buaZrhh6hjrQf17EO4Ep+MNKpnqC5xFO4JVH4K5iL7QGuzK65vJ5HQA3U9dIjlFm4TX+fH+rq IuofEWtYAV92d7wE6z9d2DHOG1fYCKgkQn5q20AH7RTOJkMQyqyP1e2qY+GNKKeDR1Ii+TyWLbFB RUdMWoMxFFFDrGAoqu5nyGE8A2b/HE8GoPLPIlM2Uh6WHG82olq9LekUXntABuqojJ5tdMf+Z1Ah PPXGY4G8px/eAU3DGHSYdHVqJJ5FAoZFRtGhv1vKqprZKKajwBiMDGOd2xbyqiLRe5cdxPj3mRIq u4tLLZ/mUpDJpXEBOuj6xqisdPvPJzmkFzdDbzd94of8Q2qgvDtp3jEA6BVDncUGscC26Nu9P+Qn YqPs99k8btWzUwh05cONavOpkEUnngQB7rIHY73izBPSx44yJjC8v7PzL4oRoB//6abplDfrn+OS jrr1EJsch1UWiMpL9R0Xxdv1EM/VtP1FLOfKfks7yDbIxEsJL/9cITWGtkM17/icvrlqJVY0NpQr /NHg0ZeNR5LC8pp4ndYVrdA04yj3b/KsXsKJlbRxEzeTDmFa6dmTM4j2rsLqKbD3E+bBaLrQ79DS YV29rVOJfslgOLeAYmlh8XMXGKpk0S0M7lnRy2UZwPUFuibuck+g199E/cIJf8txYm2VGDArPkwz BnGsprUCNW6Us4FbFiNQRRM5g+fJKCUE4klT7jxDW+Que80YbuBhxlw3d5piZ5YIHlWY5yLNG4f3 Z5G8iMOjcil/cXYSSC+/LO+AnZLGM5zbxyn3LiXGw7FUL1jqQX7dCkqtPMOlT2U+s7tok17OYJai 3TSGFjtP0rYv7bfDpfvUP1J9aHKnfNjKZsNbB/v59iQzhUH/fSSWdJ1ZHAwKkhp1Otpj2+5VE= From: =?utf-8?B?InpoaWxpemhhbyjotbXlv5fnq4spIg==?= Mime-Version: 1.0 (Mac OS X Mail 16.0 \(3696.120.41.1.1\)) Date: Fri, 18 Nov 2022 15:45:06 +0800 References: To: FFmpeg development discussions and patches In-Reply-To: X-OQ-MSGID: <8F2BE35E-179A-4805-A5F4-BE8845C80D12@foxmail.com> X-Mailer: Apple Mail (2.3696.120.41.1.1) Subject: Re: [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 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: > On Nov 3, 2022, at 22:20, Zhao Zhili wrote: > > 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) > -- > 2.34.1 > Applied as 36a8d1e729dcad6877791e1aa35c6deeab538555. _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".