github-mirrors/FFmpeg
1
0
Fork 0
mirror of https://mirror.skon.top/https://github.com/FFmpeg/FFmpeg synced 2026-04-20 12:50:49 +08:00
Code Issues Packages Projects Releases Wiki Activity

avformat/matroskaenc: Use separate buffer for SMPTE 2094 blockadditional

Browse Source 
Otherwise the buffer for the hdr10+ blockadditional would
be clobbered if both are present (the buffers can only be
reused after the ebml_writer_write() call).

Reviewed-by: James Almer <jamrial@gmail.com>
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
This commit is contained in:
Andreas Rheinhardt
2026-04-17 21:30:59 +02:00
parent 25ce544d4b
commit 38df985fba
1 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
libavformat/matroskaenc.c
View File

@@ -2848,6 +2848,8 @@ static int mkv_write_block(void *logctx, MatroskaMuxContext *mkv,
{
const AVCodecParameters *par = st->codecpar;
uint8_t t35_buf[6 + AV_HDR_PLUS_MAX_PAYLOAD_SIZE];
#define SMPTE_2094_APP5_MAX_SIZE 855
uint8_t smpte_2094_app5_buf[5 + SMPTE_2094_APP5_MAX_SIZE];
uint8_t *side_data;
size_t side_data_size;
uint64_t additional_id;
@@ -2947,11 +2949,8 @@ static int mkv_write_block(void *logctx, MatroskaMuxContext *mkv,
AV_PKT_DATA_DYNAMIC_HDR_SMPTE_2094_APP5,
&side_data_size);
if (side_data && side_data_size) {
// The maximum possible payload size for SMPTE_2094_APP5 metadata is
// 855 bytes. So it will fit into the t35_buf which is of size
// 6 + AV_HDR_PLUS_MAX_PAYLOAD_SIZE = 913.
uint8_t *payload = t35_buf;
size_t payload_size = sizeof(t35_buf) - 5;
uint8_t *payload = smpte_2094_app5_buf;
size_t payload_size = sizeof(smpte_2094_app5_buf) - 5;
bytestream_put_byte(&payload, ITU_T_T35_COUNTRY_CODE_US);
bytestream_put_be16(&payload, ITU_T_T35_PROVIDER_CODE_SMPTE);