ffmpeg | branch: master | Zhao Zhili <zhiliz...@tencent.com> | Tue Mar 11 10:34:55 2025 +0800| [f34294897ff1b2c368c8fbb6f49bd043bc6582b6] | committer: Zhao Zhili
avformat/flvdec: Fix use sizeof(AVMasteringDisplayMetadata) sizeof AVMasteringDisplayMetadata isn't part of ABI. Signed-off-by: Zhao Zhili <zhiliz...@tencent.com> Reviewed-by: Steven Liu <lingjiujia...@gmail.com> Reviewed-by: James Almer <jamr...@gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=f34294897ff1b2c368c8fbb6f49bd043bc6582b6 --- 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); _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog To unsubscribe, visit link above, or email ffmpeg-cvslog-requ...@ffmpeg.org with subject "unsubscribe".
