This is an automated email from the git hooks/post-receive script. Git pushed a commit to branch master in repository ffmpeg.
commit 5cb31ca5b28a13057070769daa73bb1486e6b542 Author: James Almer <[email protected]> AuthorDate: Mon Sep 14 23:14:04 2026 -0300 Commit: James Almer <[email protected]> CommitDate: Mon Sep 14 23:15:55 2026 -0300 avformat/matroskaenc: reserve space for BlockAdditionMapping even if Matroska muxer isn't enabled An attempt to use the space will be done even if the Matroska muxer is disabled, which will mean data will be written where no space was reserved for it, (track->blockadditionmapping_offset will be 0, on top of it). Signed-off-by: James Almer <[email protected]> --- libavformat/matroskaenc.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/libavformat/matroskaenc.c b/libavformat/matroskaenc.c index 97d66558f8..f278271e24 100644 --- a/libavformat/matroskaenc.c +++ b/libavformat/matroskaenc.c @@ -1735,10 +1735,6 @@ static void mkv_write_blockadditionmapping(AVFormatContext *s, const MatroskaMux const AVCodecParameters *par, AVIOContext *pb, mkv_track *track, const AVStream *st) { -#if CONFIG_MATROSKA_MUXER - const AVDOVIDecoderConfigurationRecord *dovi; - const AVPacketSideData *sd; - if (IS_SEEKABLE(s->pb, mkv)) { track->blockadditionmapping_offset = avio_tell(pb); // We can't know at this point if there will be a block with BlockAdditions, so @@ -1754,13 +1750,16 @@ static void mkv_write_blockadditionmapping(AVFormatContext *s, const MatroskaMux } } - sd = av_packet_side_data_get(par->coded_side_data, par->nb_coded_side_data, +#if CONFIG_MATROSKA_MUXER + const AVPacketSideData *sd = + av_packet_side_data_get(par->coded_side_data, par->nb_coded_side_data, AV_PKT_DATA_DOVI_CONF); if (!sd) return; - dovi = (const AVDOVIDecoderConfigurationRecord *)sd->data; + const AVDOVIDecoderConfigurationRecord *dovi = + (const AVDOVIDecoderConfigurationRecord *)sd->data; if (dovi->dv_profile <= 10) { ebml_master mapping; uint8_t buf[ISOM_DVCC_DVVC_SIZE]; -- To stop receiving notification emails like this one, please contact [email protected]. _______________________________________________ ffmpeg-cvslog mailing list -- [email protected] To unsubscribe send an email to [email protected]
