From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.ffmpeg.org (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTPS id 67D0D4B7AD for ; Fri, 22 Aug 2025 16:12:17 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTP id 123A968E6AE; Fri, 22 Aug 2025 19:12:13 +0300 (EEST) Received: from b0414b60bf0b (code.ffmpeg.org [188.245.149.3]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTPS id 00B2C68E6AC for ; Fri, 22 Aug 2025 19:12:11 +0300 (EEST) MIME-Version: 1.0 To: ffmpeg-devel@ffmpeg.org Subject: [FFmpeg-devel] =?utf-8?q?=5BPATCH=5D_movenc=3A_ensure_chapters_t?= =?utf-8?q?rack_extradata_is_not_null_and_populated_=28PR_=2320315=29?= X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , From: Damiano Galassi via ffmpeg-devel Reply-To: FFmpeg development discussions and patches Cc: Damiano Galassi Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Message-Id: <20250822161213.123A968E6AE@ffbox0-bg.ffmpeg.org> Date: Fri, 22 Aug 2025 19:12:13 +0300 (EEST) Archived-At: List-Archive: List-Post: PR #20315 opened by Damiano Galassi (galad) URL: https://code.ffmpeg.org/FFmpeg/FFmpeg/pulls/20315 Patch URL: https://code.ffmpeg.org/FFmpeg/FFmpeg/pulls/20315.patch Fix a regression introduced in 4eca8df, writing chapters failed if chapters where not available before mov_write_header() is called, so the chapter track is written in mov_write_trailer(), unfortunately the new track->extradata and track->extradata_size were NULL. I don't know if this can be reproduced with the FFmpeg cli, but I noticed it when updating HandBrake to FFmpeg 8. >From 649faf2040623d077cbd7da08ff43cbd46f90efc Mon Sep 17 00:00:00 2001 From: Damiano Galassi Date: Fri, 22 Aug 2025 17:01:26 +0200 Subject: [PATCH] movenc: ensure chapters track extradata is not null and populated fix a regression introduced in 4eca8df, writing chapters failed if chapters where not available before mov_write_header(). --- libavformat/movenc.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/libavformat/movenc.c b/libavformat/movenc.c index 585a018e35..f0890a9da8 100644 --- a/libavformat/movenc.c +++ b/libavformat/movenc.c @@ -7463,6 +7463,12 @@ static int mov_create_chapter_track(AVFormatContext *s, int tracknum) return ret; memcpy(track->par->extradata, stub_header, sizeof(stub_header)); + if (track->extradata == NULL) { + track->stsd_count = 1; + track->extradata = av_calloc(1, sizeof(*track->extradata)); + track->extradata_size = av_calloc(1, sizeof(*track->extradata_size)); + } + track->extradata[0] = av_memdup(stub_header, sizeof(stub_header)); if (!track->extradata[0]) return AVERROR(ENOMEM); -- 2.49.1 _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".