It's not part of the libavutil ABI.
Showing the changes to libavformat (1 of 1 file). Show all
Unified · Split
| @@ -2324,15 +2324,15 @@ static int mkv_parse_video_color(AVStream *st, const MatroskaTrack *track) { · 2323 unmodified lines | ||
| 2324 | 2324 | } |
| 2325 | 2325 | |
| 2326 | 2326 | if (has_mastering_primaries || has_mastering_luminance) { |
| 2327 | − AVMasteringDisplayMetadata *metadata; | |
| 2328 | − AVPacketSideData *sd = av_packet_side_data_new(&st->codecpar->coded_side_data, | |
| 2329 | − &st->codecpar->nb_coded_side_data, | |
| 2330 | − AV_PKT_DATA_MASTERING_DISPLAY_METADATA, | |
| 2331 | − sizeof(AVMasteringDisplayMetadata), 0); | |
| 2332 | − if (!sd) | |
| 2327 | + size_t size = 0; | |
| 2328 | + AVMasteringDisplayMetadata *metadata = av_mastering_display_metadata_alloc_size(&size); | |
| 2329 | + if (!metadata) | |
| 2330 | + return AVERROR(ENOMEM); | |
| 2331 | + if (!av_packet_side_data_add(&st->codecpar->coded_side_data, &st->codecpar->nb_coded_side_data, | |
| 2332 | + AV_PKT_DATA_MASTERING_DISPLAY_METADATA, metadata, size, 0)) { | |
| 2333 | + av_freep(&metadata); | |
| 2333 | 2334 | return AVERROR(ENOMEM); |
| 2334 | − metadata = (AVMasteringDisplayMetadata*)sd->data; | |
| 2335 | − memset(metadata, 0, sizeof(AVMasteringDisplayMetadata)); | |
| 2335 | + } | |
| 2336 | 2336 | if (has_mastering_primaries) { |
| 2337 | 2337 | metadata->display_primaries[0][0] = av_d2q(mastering_meta->r_x, INT_MAX); |
| 2338 | 2338 | metadata->display_primaries[0][1] = av_d2q(mastering_meta->r_y, INT_MAX); |