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 7FF994C660 for ; Fri, 21 Nov 2025 20:00:36 +0000 (UTC) Authentication-Results: ffbox; dkim=fail (body hash mismatch (got b'OBy371z+wE5OgSm27mA0yf/2x1SKFMHZTlB7FigVJus=', expected b'YEn2rzGcGfZnIzps31yBXZY7e5EfQQ3B7Eb6Jazvrg4=')) header.d=ffmpeg.org header.i=@ffmpeg.org header.a=rsa-sha256 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ffmpeg.org; i=@ffmpeg.org; q=dns/txt; s=mail; t=1763755229; h=mime-version : to : date : message-id : reply-to : subject : list-id : list-archive : list-archive : list-help : list-owner : list-post : list-subscribe : list-unsubscribe : from : cc : content-type : content-transfer-encoding : from; bh=OBy371z+wE5OgSm27mA0yf/2x1SKFMHZTlB7FigVJus=; b=xih63GbA4oGH2MzNvS1/AgCTXxC1XUAx5OLTZGz+QKYuy+fZqCIJ8p51gCGSgYjPSLxVe 1LowZE+4tVEVwe7mMu5W4EjT9GvvWNbqndORvSA5Gk8uhOVWdPJdItHR2x1Puiq2fzPX2FX 9ucWwBoWVfFxpIYXt6V/icLFjvXQClMp4nkPacglrbN3anw6VkumrateSDF2wFDhYD9QXhG LllVRQR5aEvwK4L9evuRwDv8MZD1oFIdvT6WlOejUZnKyjFj0j5Mu4ERETvQORhnBKNiuvS THPD48HPuLHVgE5EiatAx4mud+v6oh17eok4vpbXAlQlDB99lzgkNLThw3Lg== Received: from [172.19.0.2] (unknown [172.19.0.2]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTP id 3CA0E68FFFD; Fri, 21 Nov 2025 22:00:29 +0200 (EET) ARC-Seal: i=1; cv=none; a=rsa-sha256; d=ffmpeg.org; s=arc; t=1763755228; b=jEjMboyxOsSMwAf4ld1Wbvq77IoNzaAM1PhoM0ZGV6T9BRW0HY/v5gnRKwoW35EVX6MD9 7dmHev62seg9rCW/bVTo0Yg3tcIvUHbuw+DFNReDpICQiJcC3ykurlmgfKEFCL26KJSJ7Ep AcimTcYeCjviYW88CIEIaBRv7D45X5qC3/t/iz5Aqs9Spp6bjwgYDEKgP8SwybjkcT5ETpW SGYgp3RBCqVaSv7unDinv10iNcN3XtchmV8zEgWuDcS347VMxGKIux3geCvVr3hAJjMX0NW EVCn1309yZhbW3mGE6scGlC9Hqrv7GC3xY/aOaqdI9eCzPt4pHwDZB4IKehQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=ffmpeg.org; s=arc; t=1763755228; h=from : sender : reply-to : subject : date : message-id : to : cc : mime-version : content-type : content-transfer-encoding : content-id : content-description : resent-date : resent-from : resent-sender : resent-to : resent-cc : resent-message-id : in-reply-to : references : list-id : list-help : list-unsubscribe : list-subscribe : list-post : list-owner : list-archive; bh=/a5rPyLrjoENHBpeV+OoWXNof08GzDSql9sRUToZ5Gk=; b=dLipaiiGJJFUXt5Cijgms+BI+cJJIvVqyNbB3NMCasLGSPe9CTzlDnZeyPQZtJDMDcq+Z 9dJJqDSOY6H1SucaQsxt8vcVdwXxowrkgAcwAs2ZLPh6muMpdkF/UhIjTj1yaDFrOKZTvNF uOkk8G54WMYVuo9rgqM3lDkw9740wAzHDyi6XbcAWeVczVi7YGlPttgKA9CnyZzX9WfbFiA B9pc2nWgWJ5afQpCQUGAizbNXvSRT56+Sfm9pd7RruCxLFVoMcUwt9G2ifgmhiXQknsos89 r4jg6UQFrlSN064fU956vsoRlXa5K7Jtmp+e0w3vlWV4SQLJpPngSR+u6/Uw== ARC-Authentication-Results: i=1; ffmpeg.org; dkim=pass header.d=ffmpeg.org header.i=@ffmpeg.org; arc=none; dmarc=pass header.from=ffmpeg.org policy.dmarc=quarantine Authentication-Results: ffmpeg.org; dkim=pass header.d=ffmpeg.org header.i=@ffmpeg.org; arc=none (Message is not ARC signed); dmarc=pass (Used From Domain Record) header.from=ffmpeg.org policy.dmarc=quarantine DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ffmpeg.org; i=@ffmpeg.org; q=dns/txt; s=mail; t=1763755220; h=content-type : mime-version : content-transfer-encoding : from : to : reply-to : subject : date : from; bh=YEn2rzGcGfZnIzps31yBXZY7e5EfQQ3B7Eb6Jazvrg4=; b=a5ZXXfWKoB7g7mXRzLiTqUJZeA6MeakXAeqE2spWUycFQjcOEcMJla8BgP+DEJSchG6qZ xXYvUQRpu8OPHZNKwu0GeGxvioiPj3JGJ4f5XLfc36VLsUL3AJ/d+AtztYfcWk/ZmUpBHyY OyOhh6P8esZrWUHBuTXL+83muCOrX89WuQCZE90OvuPjwHmxP1dVz6EIpKGebe7wTn+WKZZ m/mzh7utKjeD4dYix6aGOLApXLLEsl77WXA+W1juaRgqs/1jHHzsbryLGjVuf/2hUfFzCwq fWYqQ7K/AoaEtX3sEdgCwbnF4FpXCg92eYMZJTGFf66rMYkLgZsURR5NZuBg== Received: from 55ca25703178 (code.ffmpeg.org [188.245.149.3]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTPS id D749968FF74 for ; Fri, 21 Nov 2025 22:00:20 +0200 (EET) MIME-Version: 1.0 To: ffmpeg-devel@ffmpeg.org Date: Fri, 21 Nov 2025 20:00:20 -0000 Message-ID: <176375522112.59.11997145513178747834@2cb04c0e5124> Message-ID-Hash: EF7U2GN3YX37TSKNBU33T2LOPW6ZKEET X-Message-ID-Hash: EF7U2GN3YX37TSKNBU33T2LOPW6ZKEET X-MailFrom: code@ffmpeg.org X-Mailman-Rule-Hits: nonmember-moderation X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; loop; banned-address; header-match-ffmpeg-devel.ffmpeg.org-0; header-match-ffmpeg-devel.ffmpeg.org-1; header-match-ffmpeg-devel.ffmpeg.org-2; header-match-ffmpeg-devel.ffmpeg.org-3; emergency; member-moderation X-Mailman-Version: 3.3.10 Precedence: list Reply-To: FFmpeg development discussions and patches Subject: [FFmpeg-devel] [PATCH] avformat/mov: don't parse reserved ISOBMFF fields as if they were QT (PR #20993) List-Id: FFmpeg development discussions and patches Archived-At: Archived-At: List-Archive: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: From: James Almer via ffmpeg-devel Cc: James Almer Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Archived-At: List-Archive: List-Post: PR #20993 opened by James Almer (jamrial) URL: https://code.ffmpeg.org/FFmpeg/FFmpeg/pulls/20993 Patch URL: https://code.ffmpeg.org/FFmpeg/FFmpeg/pulls/20993.patch >>From 79823311f5ac847b7a85319b7814959bc84d89a7 Mon Sep 17 00:00:00 2001 From: James Almer Date: Fri, 21 Nov 2025 16:58:13 -0300 Subject: [PATCH] avformat/mov: don't parse reserved ISOBMFF fields as if they were QT Signed-off-by: James Almer --- libavformat/mov.c | 10 ++++++++++ tests/ref/fate/mov-mp4-iamf-5_1_4 | 2 -- tests/ref/fate/mov-mp4-iamf-7_1_4-video-first | 2 -- tests/ref/fate/mov-mp4-iamf-7_1_4-video-last | 2 -- tests/ref/fate/mov-mp4-iamf-ambisonic_1 | 2 -- tests/ref/fate/mov-mp4-iamf-stereo | 2 -- 6 files changed, 10 insertions(+), 10 deletions(-) diff --git a/libavformat/mov.c b/libavformat/mov.c index eab9f79577..a3e1ba0a31 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -2678,12 +2678,18 @@ static void mov_parse_stsd_video(MOVContext *c, AVIOContext *pb, * read in ff_mov_read_stsd_entries() */ stsd_start = avio_tell(pb) - 16; + if (c->isom) { + avio_skip(pb, 2); /* pre_defined */ + avio_skip(pb, 2); /* reserved */ + avio_skip(pb, 12); /* pre_defined */ + } else { avio_rb16(pb); /* version */ avio_rb16(pb); /* revision level */ id = avio_rl32(pb); /* vendor */ av_dict_set(&st->metadata, "vendor_id", av_fourcc2str(id), 0); avio_rb32(pb); /* temporal quality */ avio_rb32(pb); /* spatial quality */ + } st->codecpar->width = avio_rb16(pb); /* width */ st->codecpar->height = avio_rb16(pb); /* height */ @@ -2733,9 +2739,13 @@ static void mov_parse_stsd_audio(MOVContext *c, AVIOContext *pb, AVDictionaryEntry *compatible_brands = av_dict_get(c->fc->metadata, "compatible_brands", NULL, AV_DICT_MATCH_CASE); int channel_count; + if (c->isom) + avio_skip(pb, 6); /* reserved */ + else { avio_rb16(pb); /* revision level */ id = avio_rl32(pb); /* vendor */ av_dict_set(&st->metadata, "vendor_id", av_fourcc2str(id), 0); + } channel_count = avio_rb16(pb); diff --git a/tests/ref/fate/mov-mp4-iamf-5_1_4 b/tests/ref/fate/mov-mp4-iamf-5_1_4 index 18a1f5337f..9eaa5ee42d 100644 --- a/tests/ref/fate/mov-mp4-iamf-5_1_4 +++ b/tests/ref/fate/mov-mp4-iamf-5_1_4 @@ -160,7 +160,6 @@ DISPOSITION:still_image=0 DISPOSITION:multilayer=0 TAG:language=und TAG:handler_name=SoundHandler -TAG:vendor_id=[0][0][0][0] [STREAM] index=0 id=0x0 @@ -395,7 +394,6 @@ DISPOSITION:still_image=0 DISPOSITION:multilayer=0 TAG:language=und TAG:handler_name=SoundHandler -TAG:vendor_id=[0][0][0][0] [STREAM] index=0 id=0x0 diff --git a/tests/ref/fate/mov-mp4-iamf-7_1_4-video-first b/tests/ref/fate/mov-mp4-iamf-7_1_4-video-first index d5a1fe1cad..55cadb3d02 100644 --- a/tests/ref/fate/mov-mp4-iamf-7_1_4-video-first +++ b/tests/ref/fate/mov-mp4-iamf-7_1_4-video-first @@ -207,7 +207,6 @@ DISPOSITION:still_image=0 DISPOSITION:multilayer=0 TAG:language=und TAG:handler_name=SoundHandler -TAG:vendor_id=[0][0][0][0] [STREAM] index=1 id=0x2 @@ -465,7 +464,6 @@ DISPOSITION:still_image=0 DISPOSITION:multilayer=0 TAG:language=und TAG:handler_name=SoundHandler -TAG:vendor_id=[0][0][0][0] [STREAM] index=1 id=0x2 diff --git a/tests/ref/fate/mov-mp4-iamf-7_1_4-video-last b/tests/ref/fate/mov-mp4-iamf-7_1_4-video-last index caf89d41f6..80c924c821 100644 --- a/tests/ref/fate/mov-mp4-iamf-7_1_4-video-last +++ b/tests/ref/fate/mov-mp4-iamf-7_1_4-video-last @@ -207,7 +207,6 @@ DISPOSITION:still_image=0 DISPOSITION:multilayer=0 TAG:language=und TAG:handler_name=SoundHandler -TAG:vendor_id=[0][0][0][0] [STREAM] index=0 id=0x9 @@ -465,7 +464,6 @@ DISPOSITION:still_image=0 DISPOSITION:multilayer=0 TAG:language=und TAG:handler_name=SoundHandler -TAG:vendor_id=[0][0][0][0] [STREAM] index=0 id=0x9 diff --git a/tests/ref/fate/mov-mp4-iamf-ambisonic_1 b/tests/ref/fate/mov-mp4-iamf-ambisonic_1 index d0877f73c7..b6f14099c3 100644 --- a/tests/ref/fate/mov-mp4-iamf-ambisonic_1 +++ b/tests/ref/fate/mov-mp4-iamf-ambisonic_1 @@ -99,7 +99,6 @@ DISPOSITION:still_image=0 DISPOSITION:multilayer=0 TAG:language=und TAG:handler_name=SoundHandler -TAG:vendor_id=[0][0][0][0] [STREAM] index=0 id=0x0 @@ -264,7 +263,6 @@ DISPOSITION:still_image=0 DISPOSITION:multilayer=0 TAG:language=und TAG:handler_name=SoundHandler -TAG:vendor_id=[0][0][0][0] [STREAM] index=0 id=0x0 diff --git a/tests/ref/fate/mov-mp4-iamf-stereo b/tests/ref/fate/mov-mp4-iamf-stereo index ca8f6a76f5..85e6e3efbb 100644 --- a/tests/ref/fate/mov-mp4-iamf-stereo +++ b/tests/ref/fate/mov-mp4-iamf-stereo @@ -52,7 +52,6 @@ DISPOSITION:still_image=0 DISPOSITION:multilayer=0 TAG:language=und TAG:handler_name=SoundHandler -TAG:vendor_id=[0][0][0][0] [STREAM] index=0 id=0x0 @@ -187,7 +186,6 @@ DISPOSITION:still_image=0 DISPOSITION:multilayer=0 TAG:language=und TAG:handler_name=SoundHandler -TAG:vendor_id=[0][0][0][0] [STREAM] index=0 id=0x0 -- 2.49.1 _______________________________________________ ffmpeg-devel mailing list -- ffmpeg-devel@ffmpeg.org To unsubscribe send an email to ffmpeg-devel-leave@ffmpeg.org