har0ke/FFmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

avformat/matroskadec: also export non-HDR10+ ITU-T T.35 payloads as BlockAdditional side data

Browse Source 
Partially reverts a change from 88de01d878167cbff9af32c0b7366e0aae3db2bd, and
2133cadfcf9a613cf2c0060f9896bba49dabfba4.

Signed-off-by: James Almer <jamrial@gmail.com>
This commit is contained in:
James Almer 2023-04-10 18:45:21 -03:00
parent b18a9c2971
commit c558fcf41e
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
libavformat/matroskadec.c
View File

@ -3719,19 +3719,21 @@ static int matroska_parse_block_additional(MatroskaDemuxContext *matroska,
av_free(hdrplus);
return res;
}
break;
return 0;
}
default:
side_data = av_packet_new_side_data(pkt, AV_PKT_DATA_MATROSKA_BLOCKADDITIONAL,
size + (size_t)8);
if (!side_data)
return AVERROR(ENOMEM);
AV_WB64(side_data, id);
memcpy(side_data + 8, data, size);
break;
}
side_data = av_packet_new_side_data(pkt, AV_PKT_DATA_MATROSKA_BLOCKADDITIONAL,
size + (size_t)8);
if (!side_data)
return AVERROR(ENOMEM);
AV_WB64(side_data, id);
memcpy(side_data + 8, data, size);
return 0;
}