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 7C1B140128 for ; Thu, 3 Nov 2022 11:11:17 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 5CA3E68BF21; Thu, 3 Nov 2022 13:11:14 +0200 (EET) Received: from out203-205-251-27.mail.qq.com (out203-205-251-27.mail.qq.com [203.205.251.27]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 6B04868BD8E for ; Thu, 3 Nov 2022 13:11:07 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foxmail.com; s=s201512; t=1667473863; bh=5SWsUUgn/2+U3Zt9e2PzeW6wAo5I2ipu3kNdd8bjEQA=; h=From:To:Cc:Subject:Date; b=um07fREAi1aLX8pcqA4u09kRP95RQ7yxiRJxOmkIpfIplav1qD2c1K+YfUMBWoH3k ML1UUV+Oehfa6/U23bIFVLYROk13BaBeB4dydGuKBibMbBGGBLAI57jCoXefbNFC/e NPdxq3jHNKjNo/pp3gQka89cP9UWSBHx2Y5pnULc= Received: from localhost.localdomain ([59.37.125.102]) by newxmesmtplogicsvrszc2-0.qq.com (NewEsmtp) with SMTP id 2C29B4CE; Thu, 03 Nov 2022 19:11:02 +0800 X-QQ-mid: xmsmtpt1667473862tipc128h8 Message-ID: X-QQ-XMAILINFO: Np4aCeRla9RlJlwKHA6cCfDjJaQGuOluYkqA+LC0dLO+KKkEiQUFtcws7T45eA MhPB+10Q8vFTO47T0Jup2TU+5VjW8qPSFoB0TDaTBN8JwAdbrvG79brlnX7IIoaRS5or370AwwmB O0yhr4hnnsvrY2+Wl7dFKxrLeJnqB5AEDLlpNzfqZM4eDXS77sVRQ3ASLpRy/fRJqOE8WZpCXjzY iNFClMg9O3kAg4/yMbTmwb/tqTFvIJA/HM6qloxhbhaYsuG2DzUB60M61/7qWTbV+d+LoCnURFvM 2UWt3NnYdepaDdOvfxEQBojhiC+IysEYOGXz2t+bhjLWpaZN0tb6iPpuHYKnigD52f/2ZL7UD23M FVO7Mp5bHfOQaCXbqFHuUb2XebM7R6yj7CnMGyQGZtZpDKbBXn60L0xiyt06ZMkTPQju79THSlxm dE2jUu8qdwnJ8S76dJXYw/E7lxIYVxo7zPv1qTJJ7BJkmzJ9vIfuEaTm1DLbRbaZGAIyv9E35SMZ 0tlUO1o9m3rYRI/XdG8I2BWrnepYTRMVzX6RCULY6v7olTLYwT9YveOI00Ik1XtUE2PnzTrGxVLQ ckXNSKm9QJTT1x+4lK+wFYuk7xIYk1PNlH37CyTX/ZQGwE3FXj11//k3yn78HkjJNNolvFpb0Gf6 ZBqrpIHeOjUkt3g6Q/QZa7/K00W+G9jXf5D0hyO/8NFXtXfYGVGGleK4TlSmiGhyNkhxIhsogKHl yYvsk1EHvNfq6GLh+YWuJaKeeyNtZINDgxpeTk+E5f6g5+FjHaQjhWqOONv7bRWIjq76qbHGnOYD dNFhMI+zY86JIsOtlNX7bIKdq+PDZAh6NYjWD6ekZVM5NuFptFg3O9wMJ9cFjTfUUf93/OUi976+ vFY7nrWOX1FbJ7vyL7Z5gB9q3P9mEI6lwR9dkaKduNBQsoqUgiuCbTgWQjNnJobPmkU1aC5xW8um qt3zLbxn7LNdGzxehZjA== From: Zhao Zhili To: ffmpeg-devel@ffmpeg.org Date: Thu, 3 Nov 2022 19:11:08 +0800 X-OQ-MSGID: <20221103111108.28031-1-quinkblack@foxmail.com> X-Mailer: git-send-email 2.25.1 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 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: From: Zhao Zhili x265_sei is available since X265_BUILD 88. This fixes a regression from commit 1f585030137. 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 } }; -- 2.25.1 _______________________________________________ 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".