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 6ED7448B53 for ; Mon, 4 Mar 2024 13:11:05 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 68DD668D4BD; Mon, 4 Mar 2024 15:07:37 +0200 (EET) Received: from mail1.khirnov.net (quelana.khirnov.net [94.230.150.81]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 9076B68D44D for ; Mon, 4 Mar 2024 15:07:14 +0200 (EET) Authentication-Results: mail1.khirnov.net; dkim=pass (2048-bit key; unprotected) header.d=khirnov.net header.i=@khirnov.net header.a=rsa-sha256 header.s=mail header.b=Ztz1Ggx6; dkim-atps=neutral Received: from localhost (mail1.khirnov.net [IPv6:::1]) by mail1.khirnov.net (Postfix) with ESMTP id 7CD4B4D6C for ; Mon, 4 Mar 2024 14:07:12 +0100 (CET) Received: from mail1.khirnov.net ([IPv6:::1]) by localhost (mail1.khirnov.net [IPv6:::1]) (amavis, port 10024) with ESMTP id c_RODVzHv-Ms for ; Mon, 4 Mar 2024 14:07:12 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=khirnov.net; s=mail; t=1709557627; bh=dTLv2T2c5z8sskidsDpvGW+1CnEdqVVvfCQJomBGDIo=; h=From:To:Subject:Date:In-Reply-To:References:From; b=Ztz1Ggx6636lux+/sZWRNx19uXYnIEHOrtM37qgR/zS79vXw/bFX38vsH3rS8MPV9 p7cm6s8WCibc1n+Ov0/gEd3WKGovHCZ7D9X6sedAvVVExyRL9uepZIYj1B5bFIAqnT HF4nTK9Mvc+Hj+LSJRVUkwZ6M3FXcH34pmuroXnyWZI4w/sl9LZWTYH5ZPPzHyadm4 gZ7aCSop0b9X4rBWiysaeE+53mP0IK7Z94nvF8bMsdYfhrWCWPipl72DQ8beoV+mLw FNr9SqIjhCjYV3xBKKsVgNlgPLydlHsmdTgnDmKTBgwbRrIIdWJZSITH8v+YU+p5ER BQ2roRdG2F2MQ== Received: from libav.khirnov.net (libav.khirnov.net [IPv6:2a00:c500:561:201::7]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "libav.khirnov.net", Issuer "smtp.khirnov.net SMTP CA" (verified OK)) by mail1.khirnov.net (Postfix) with ESMTPS id F15094D51 for ; Mon, 4 Mar 2024 14:07:06 +0100 (CET) Received: from libav.khirnov.net (libav.khirnov.net [IPv6:::1]) by libav.khirnov.net (Postfix) with ESMTP id 24B5F3A17AF for ; Mon, 4 Mar 2024 14:07:01 +0100 (CET) From: Anton Khirnov To: ffmpeg-devel@ffmpeg.org Date: Mon, 4 Mar 2024 14:06:42 +0100 Message-ID: <20240304130657.30631-27-anton@khirnov.net> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240304130657.30631-1-anton@khirnov.net> References: <20240304130657.30631-1-anton@khirnov.net> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 27/29] avcodec/hevcdec: switch to ff_frame_new_side_data_from_buf 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: From: Niklas Haas For consistency, even though this cannot be overriden at the packet level. Signed-off-by: Anton Khirnov --- libavcodec/hevcdec.c | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/libavcodec/hevcdec.c b/libavcodec/hevcdec.c index 76aa6b4588..a6b124dd2a 100644 --- a/libavcodec/hevcdec.c +++ b/libavcodec/hevcdec.c @@ -2825,11 +2825,9 @@ static int set_side_data(HEVCContext *s) } if (s->rpu_buf) { - AVFrameSideData *rpu = av_frame_new_side_data_from_buf(out, AV_FRAME_DATA_DOVI_RPU_BUFFER, s->rpu_buf); - if (!rpu) - return AVERROR(ENOMEM); - - s->rpu_buf = NULL; + ret = ff_frame_new_side_data_from_buf(s->avctx, out, AV_FRAME_DATA_DOVI_RPU_BUFFER, &s->rpu_buf, NULL); + if (ret < 0) + return ret; } if ((ret = ff_dovi_attach_side_data(&s->dovi_ctx, out)) < 0) @@ -2840,10 +2838,9 @@ static int set_side_data(HEVCContext *s) if (!info_ref) return AVERROR(ENOMEM); - if (!av_frame_new_side_data_from_buf(out, AV_FRAME_DATA_DYNAMIC_HDR_VIVID, info_ref)) { - av_buffer_unref(&info_ref); - return AVERROR(ENOMEM); - } + ret = ff_frame_new_side_data_from_buf(s->avctx, out, AV_FRAME_DATA_DYNAMIC_HDR_VIVID, &info_ref, NULL); + if (ret < 0) + return ret; } return 0; -- 2.43.0 _______________________________________________ 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".