This is an automated email from the git hooks/post-receive script. Git pushed a commit to branch master in repository ffmpeg.
commit df9caa03b81da806def05d6cf0c796bb252a54ef Author: James Almer <[email protected]> AuthorDate: Fri Jun 26 13:45:48 2026 -0300 Commit: James Almer <[email protected]> CommitDate: Mon Jun 29 12:38:12 2026 -0300 avformat/movenc: preserve packet side data when merging eac3 packets If the last packet fed to the muxer has skip samples side data, if it were to be merged into a single packet, said side data would be lost as is. Copy it to the merged packet. Signed-off-by: James Almer <[email protected]> --- libavformat/movenc.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/libavformat/movenc.c b/libavformat/movenc.c index 48914de5e8..f1e3e3faef 100644 --- a/libavformat/movenc.c +++ b/libavformat/movenc.c @@ -597,8 +597,15 @@ concatenate: info->num_blocks = num_blocks; goto end; } else { + const AVPacketSideData *sd; if ((ret = av_grow_packet(info->pkt, pkt->size)) < 0) goto end; + sd = av_packet_side_data_get(pkt->side_data, pkt->side_data_elems, AV_PKT_DATA_SKIP_SAMPLES); + if (sd && sd->size >= 10) { + uint8_t *buf = av_packet_new_side_data(info->pkt, AV_PKT_DATA_SKIP_SAMPLES, sd->size); + if (buf) + memcpy(buf, sd->data, sd->size); + } memcpy(info->pkt->data + info->pkt->size - pkt->size, pkt->data, pkt->size); info->num_blocks += num_blocks; info->pkt->duration += pkt->duration; _______________________________________________ ffmpeg-cvslog mailing list -- [email protected] To unsubscribe send an email to [email protected]
