RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

avformat/mxfdec: don't use sizeof(AVMasteringDisplayMetadata) 

It's not part of the libavutil ABI.

Signed-off-by: James Almer <jamrial@gmail.com>
This commit is contained in:
James Almer 2024-06-19 15:20:12 -03:00
parent a91f34aad8
commit 35df214a72
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libavformat/mxfdec.c
View File

@ -227,6 +227,7 @@ typedef struct MXFDescriptor {
UID color_trc_ul; UID color_trc_ul;
UID color_space_ul; UID color_space_ul;
AVMasteringDisplayMetadata *mastering; AVMasteringDisplayMetadata *mastering;
size_t mastering_size;
AVContentLightMetadata *coll; AVContentLightMetadata *coll;
size_t coll_size; size_t coll_size;
} MXFDescriptor; } MXFDescriptor;
@ -1424,7 +1425,7 @@ static int mxf_read_generic_descriptor(void *arg, AVIOContext *pb, int tag, int
} }
if (IS_KLV_KEY(uid, mxf_mastering_display_prefix)) { if (IS_KLV_KEY(uid, mxf_mastering_display_prefix)) {
if (!descriptor->mastering) { if (!descriptor->mastering) {
descriptor->mastering = av_mastering_display_metadata_alloc(); descriptor->mastering = av_mastering_display_metadata_alloc_size(&descriptor->mastering_size);
if (!descriptor->mastering) if (!descriptor->mastering)
return AVERROR(ENOMEM); return AVERROR(ENOMEM);
} }
@ -2955,7 +2956,7 @@ static int mxf_parse_structural_metadata(MXFContext *mxf)
if (descriptor->mastering) { if (descriptor->mastering) {
if (!av_packet_side_data_add(&st->codecpar->coded_side_data, &st->codecpar->nb_coded_side_data, if (!av_packet_side_data_add(&st->codecpar->coded_side_data, &st->codecpar->nb_coded_side_data,
AV_PKT_DATA_MASTERING_DISPLAY_METADATA, AV_PKT_DATA_MASTERING_DISPLAY_METADATA,
(uint8_t *)descriptor->mastering, sizeof(*descriptor->mastering), 0)) { (uint8_t *)descriptor->mastering, descriptor->mastering_size, 0)) {
ret = AVERROR(ENOMEM); ret = AVERROR(ENOMEM);
goto fail_and_free; goto fail_and_free;
} }