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 0743E4C4AD for ; Sun, 3 Aug 2025 16:54:05 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTP id BF7B868C375; Sun, 3 Aug 2025 19:54:01 +0300 (EEST) Received: from b4c1bdff425b (code.ffmpeg.org [188.245.149.3]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTPS id 6038D68C375 for ; Sun, 3 Aug 2025 19:54:00 +0300 (EEST) MIME-Version: 1.0 From: James Almer To: ffmpeg-devel@ffmpeg.org Subject: [FFmpeg-devel] [PATCH] avformat/mov: set primary extradata based on the first Sample only if it's not already in place (PR #20098) 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: , Reply-To: FFmpeg development discussions and patches Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Message-Id: <20250803165401.BF7B868C375@ffbox0-bg.ffmpeg.org> Date: Sun, 3 Aug 2025 19:54:01 +0300 (EEST) Archived-At: List-Archive: List-Post: PR #20098 opened by James Almer (jamrial) URL: https://code.ffmpeg.org/FFmpeg/FFmpeg/pulls/20098 Patch URL: https://code.ffmpeg.org/FFmpeg/FFmpeg/pulls/20098.patch If the first Sample references the first stsd entry, then setting it here is redundant. >>From 925d0d2c21c97f9cae7b69409964adb6ed6af255 Mon Sep 17 00:00:00 2001 From: James Almer Date: Sun, 3 Aug 2025 13:30:42 -0300 Subject: [PATCH] avformat/mov: set primary extradata based on the first Sample only if it's not already in place If the first Sample references the first stsd entry, then setting it here is redundant. Signed-off-by: James Almer --- libavformat/mov.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavformat/mov.c b/libavformat/mov.c index 40105a408d..eb96136550 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -10685,9 +10685,9 @@ static int mov_read_header(AVFormatContext *s) uint32_t dvdsub_clut[FF_DVDCLUT_CLUT_LEN] = {0}; fix_timescale(mov, sc); - /* Set the primary extradata based on the first Sample. */ + /* Set the primary extradata based on the first Sample if it doesn't reference the first stsd entry. */ if (sc->stsc_count && sc->extradata_size && !sc->iamf && - sc->stsc_data[0].id > 0 && sc->stsc_data[0].id <= sc->stsd_count) { + sc->stsc_data[0].id > 1 && sc->stsc_data[0].id <= sc->stsd_count) { sc->last_stsd_index = sc->stsc_data[0].id - 1; av_freep(&st->codecpar->extradata); st->codecpar->extradata_size = sc->extradata_size[sc->last_stsd_index]; -- 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".