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 7C27B40146 for ; Thu, 3 Nov 2022 12:32:18 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 52FD868BF5F; Thu, 3 Nov 2022 14:32:16 +0200 (EET) Received: from mail-oa1-f42.google.com (mail-oa1-f42.google.com [209.85.160.42]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id DAA2268BF5A for ; Thu, 3 Nov 2022 14:32:10 +0200 (EET) Received: by mail-oa1-f42.google.com with SMTP id 586e51a60fabf-13b6c1c89bdso1887226fac.13 for ; Thu, 03 Nov 2022 05:32:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:in-reply-to:from:content-language :references:to:subject:user-agent:mime-version:date:message-id:from :to:cc:subject:date:message-id:reply-to; bh=wZvQXlMx1iBv2ROsn9c0ziKnbZoVsqz94HuIUTawSNk=; b=VrTLfqQDB998FSynC7iS8N9//BGo9xlfF092G53tyrPnbl+Q/jUewyBOSImIOc6mL2 eTnauuT/AH0yzikPUz+DyJId6i+IRQdr6bpXAaV2I3Q2lUmcI/rismx8W4z4iKrfcRcb lrj+xiczFcv8tY3L9pLHKwU1ie+Kmxvx300Za9QuST5txslVdbQz+lO3UP97sGi4o4Rz v1fAoML+yAo3MZLX5KZvlpwp8iSeNJo07LrheRmfIzAxa9G7LlcEI85+EkYSqXZrdhoP pMg0ew15k2vrzerCgVJSMJG8rcdBkKYLYvREKtOaSLnsoivld2+cNgu+YMkptqkXR300 ji0A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:in-reply-to:from:content-language :references:to:subject:user-agent:mime-version:date:message-id :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=wZvQXlMx1iBv2ROsn9c0ziKnbZoVsqz94HuIUTawSNk=; b=IJhD1B24lIo0e0yYnx/0i+L4iA7ZqjAeN/6NU4Mk2XjC809QVdxjgcL3M8RwMVmF/f 6DA/sFgJFvy98oNfr0y8/ENrEDU+GfD0ACvfeBdKG70Q72wNdvO94/dKFAHt06OHM6hm K6KyaV7GrRBmloRf5/rhQ+HnMeSuayz8CwuzzYGGsL3fWvDuaCwyIc/NroJW/tHUUVbs LEIhCVRWuifAZW/qk2PrhqfwsOTLmeDeo/8G6v1TqPA4CQneode1D5UL404+H8100ZSE yyQRcZKUVLXXszm8gn0vgib+iFjEFOXLY5gQ9aiPvgg+QUr10oYiiTs70rLb9LNu1rt6 Cibw== X-Gm-Message-State: ACrzQf0SuGRtf7xeKmnEwHPwgJ1B14+vtp/StyPuflrq2BTLUe1MjkIM jYV5+9uCUS9rYyJiQ0z2HEN8St5K9+8= X-Google-Smtp-Source: AMsMyM7VQpI9eW8zSDg90hV86XNL4Z70E+ThcaJtE/6Cy2JlgBf22/4eHztwk31c2UvizEMVHR8gYg== X-Received: by 2002:a05:6870:2043:b0:13c:f48b:7ca8 with SMTP id l3-20020a056870204300b0013cf48b7ca8mr13481615oad.169.1667478729012; Thu, 03 Nov 2022 05:32:09 -0700 (PDT) Received: from [192.168.0.13] ([191.97.187.183]) by smtp.gmail.com with ESMTPSA id q17-20020a9d6311000000b0066ac42bc8a4sm271049otk.33.2022.11.03.05.32.08 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Thu, 03 Nov 2022 05:32:08 -0700 (PDT) Message-ID: Date: Thu, 3 Nov 2022 09:32:16 -0300 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:102.0) Gecko/20100101 Thunderbird/102.4.1 To: ffmpeg-devel@ffmpeg.org References: Content-Language: en-US From: James Almer In-Reply-To: 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-Transfer-Encoding: 7bit Content-Type: text/plain; charset="us-ascii"; Format="flowed" Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: On 11/3/2022 8:11 AM, Zhao Zhili wrote: > From: Zhao Zhili > > x265_sei is available since X265_BUILD 88. This fixes a regression > from commit 1f585030137. How old are we talking about? Latest release is > 200, so 88 seems pretty old. I'd just bump the minimum required version in configure. It's 70 right now, which is equally ancient. > > Signed-off-by: Zhao Zhili > --- > libavcodec/libx265.c | 6 ++++++ > 1 file changed, 6 insertions(+) > > diff --git a/libavcodec/libx265.c b/libavcodec/libx265.c > index 4aa96e1f2d..e36f20a812 100644 > --- a/libavcodec/libx265.c > +++ b/libavcodec/libx265.c > @@ -516,8 +516,10 @@ static int libx265_encode_frame(AVCodecContext *avctx, AVPacket *pkt, > ctx->api->picture_init(ctx->params, &x265pic); > > if (pic) { > +#if X265_BUILD >= 88 > x265_sei *sei = &x265pic.userSEI; > sei->numPayloads = 0; > +#endif > for (i = 0; i < 3; i++) { > x265pic.planes[i] = pic->data[i]; > x265pic.stride[i] = pic->linesize[i]; > @@ -546,6 +548,7 @@ static int libx265_encode_frame(AVCodecContext *avctx, AVPacket *pkt, > memcpy(x265pic.userData, &pic->reordered_opaque, sizeof(pic->reordered_opaque)); > } > > +#if X265_BUILD >= 88 > if (ctx->udu_sei) { > for (i = 0; i < pic->nb_side_data; i++) { > AVFrameSideData *side_data = pic->side_data[i]; > @@ -573,6 +576,7 @@ static int libx265_encode_frame(AVCodecContext *avctx, AVPacket *pkt, > sei->numPayloads++; > } > } > +#endif > } > > ret = ctx->api->encoder_encode(ctx->encoder, &nal, &nnal, > @@ -713,7 +717,9 @@ static const AVOption options[] = { > { "preset", "set the x265 preset", OFFSET(preset), AV_OPT_TYPE_STRING, { 0 }, 0, 0, VE }, > { "tune", "set the x265 tune parameter", OFFSET(tune), AV_OPT_TYPE_STRING, { 0 }, 0, 0, VE }, > { "profile", "set the x265 profile", OFFSET(profile), AV_OPT_TYPE_STRING, { 0 }, 0, 0, VE }, > +#if X265_BUILD >= 88 > { "udu_sei", "Use user data unregistered SEI if available", OFFSET(udu_sei), AV_OPT_TYPE_BOOL, { .i64 = 0 }, 0, 1, VE }, > +#endif > { "x265-params", "set the x265 configuration using a :-separated list of key=value parameters", OFFSET(x265_opts), AV_OPT_TYPE_DICT, { 0 }, 0, 0, VE }, > { NULL } > }; _______________________________________________ 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".