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 ESMTPS id D00574E280 for ; Mon, 10 Mar 2025 14:40:46 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 37F5068E429; Mon, 10 Mar 2025 16:40:41 +0200 (EET) Received: from out162-62-57-87.mail.qq.com (out162-62-57-87.mail.qq.com [162.62.57.87]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id BD00868E3D0 for ; Mon, 10 Mar 2025 16:40:33 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foxmail.com; s=s201512; t=1741617626; bh=2H3QTi1iAFGsuGlVZ8jtxQzTobpYYwRwWuxxsYGmrdo=; h=From:To:Cc:Subject:Date; b=sntKSG+Etf2RpIl7ajQzGU873iX21NcHAD5GranGhjeWczzbJUf5KCtGiNJmELPnP bkJERHT4y8Po2K0emhZnugCrFMIJrj8Ho+qeI6tVULTxW6gvjNOEdDqK9BVcnNUyBm nOER3Nku65hNghsJ1u0NPp2Dv+CsfZBLeFSEFCuU= Received: from localhost.localdomain ([119.147.10.242]) by newxmesmtplogicsvrszc16-0.qq.com (NewEsmtp) with SMTP id A18BB4C4; Mon, 10 Mar 2025 22:40:24 +0800 X-QQ-mid: xmsmtpt1741617624txaczbm2w Message-ID: X-QQ-XMAILINFO: NU8eBzUWfc8Fm8jgVRwXfDMdWkjY/Sbqdi2qLE4TRWnVbNpCWlEyp0EW//MQQc 7zfQ+bW1rRnSQRSWvgr3WG3EeBzMePenmLxxPpraALsCzuXyGDWYN3/JFWi/fzJjEmDljY/0IRts b05LMYNQL9tJEdRmB8Kcd6AI15CeTEESvbp/KsnHNsITw1oYrJFFulbCFPqxIdeYcnJ7W8LqjdxV wMEn/0pcVFMNWVYijUoI/9W99oCkIuKVI6rVkZsHDbj20OJAVzqt/GNJfze9+By12UWdZ3Kxs+O2 yITsrSqtAnj+5FDd7DRqAHuteO1bIojMwjSN7Hwn0Uh27wi7TKrgHZQklB0MpIDS7Bx7YPd5ZHJJ JvOYUX4N0WWLYyzRqKkPMdHZV+shdbpj9V5s+xYco2MPgV5wwNRVA4heeRh6Q1yv9aPpbCITWAOk bkYqEyKYtdyYyIyzTrFv1+vYvTHZpX1d8was13lnsmjUIVeB70Ya9mAFnXgqLEHCU+FbiLrR20Zg aVQWMdBS+F/91/+vNqrM5vbbyH1DxG94E5JNbldlHYo40aHHqYw4zZrU6UxjBbMcUJUpbK/UjIoT POY76JY+n2ms7rSqg/s4HjM+ZD5giL2O9y/tXr8CcwaA4/Ag+2W/GBGZd5Q5UEXLjnwJPUJL4J3V QdQR+ROI1uxEhyQDooEuTKbTg8nZjAR0L6R1PBBOlM0yKzlP6Ckfm5l4YwIOwAGt8RDT/K/jF4Fe vWTZY1SJQ3CsnOk7fOuwW8mHpWK2BNiezVwWAOmc5YGvMwb1c+M5y22zCGHhuOTtQZ4zt3VLxsLF +pZxGzN+wxv4zDxHvKit9fyzTm/SEJhKpasBbzL7+LOw9/ozQV5LaM9/4cCW46162iCbfNmrtVqd 600D7uB4EcB1G0+9Q8Jyykld5rzEwr90+Y/VB8EFoT0+8nHKXfwGf0/InXrSXNrzq1kqAx+XqvSp MbFiHm6yMgLyVrDq9K5+gn6C92EVavWKJ0mDTmgo9h9n/VxqYQWUR5/GqAyXp100H3iTWq9Lx7Vo QtHtZSuw== X-QQ-XMRINFO: NyFYKkN4Ny6FSmKK/uo/jdU= From: Zhao Zhili To: ffmpeg-devel@ffmpeg.org Date: Mon, 10 Mar 2025 22:40:23 +0800 X-OQ-MSGID: <20250310144023.89498-1-quinkblack@foxmail.com> X-Mailer: git-send-email 2.46.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 2/6] avformat/flvdec: Fix use sizeof(AVMasteringDisplayMetadata) 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 sizeof AVMasteringDisplayMetadata isn't part of ABI. --- libavformat/flvdec.c | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/libavformat/flvdec.c b/libavformat/flvdec.c index 62baeafafd..7ea4275784 100644 --- a/libavformat/flvdec.c +++ b/libavformat/flvdec.c @@ -1248,15 +1248,22 @@ static int flv_update_video_color_info(AVFormatContext *s, AVStream *st) } if (has_mastering_primaries || has_mastering_luminance) { - AVMasteringDisplayMetadata *metadata; - AVPacketSideData *sd = av_packet_side_data_new(&st->codecpar->coded_side_data, + size_t size = 0; + AVMasteringDisplayMetadata *metadata = av_mastering_display_metadata_alloc_size(&size); + AVPacketSideData *sd; + + if (!metadata) + return AVERROR(ENOMEM); + + sd = av_packet_side_data_add(&st->codecpar->coded_side_data, &st->codecpar->nb_coded_side_data, AV_PKT_DATA_MASTERING_DISPLAY_METADATA, - sizeof(AVMasteringDisplayMetadata), 0); - if (!sd) + metadata, size, 0); + if (!sd) { + av_freep(&metadata); return AVERROR(ENOMEM); - metadata = (AVMasteringDisplayMetadata*)sd->data; - memset(metadata, 0, sizeof(AVMasteringDisplayMetadata)); + } + // hdrCll if (has_mastering_luminance) { metadata->max_luminance = av_d2q(mastering_meta->max_luminance, INT_MAX); -- 2.46.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".