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 D1E654D444 for ; Thu, 20 Nov 2025 03:27:16 +0000 (UTC) Authentication-Results: ffbox; dkim=fail (body hash mismatch (got b'1YAlv2yHzmcplP1/jNfFftC2Ijwq8iNAWkLcVbNEui4=', expected b'SJa39HMHWFYvADhenHVi32TFwhiv67gb39kI3GFzANk=')) 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=1763609231; 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=1YAlv2yHzmcplP1/jNfFftC2Ijwq8iNAWkLcVbNEui4=; b=sNko/hfo/BWmczaoE1LEGOg/YCu4fbHCEjzPEeFc+wHT4nungDiMkMVdjK/8sw2ks1HCK ARDOny9zQDgSBC0Ry5hAQxXeBFShnnrp2p6G+QL1KciDH9Waqy8PovQNDGeBBF3eqCc50b+ 42RBoDqz6GoJK3HdWzBAhcb0ckiah6M1DxXRV+JKvC7XQIGyebvrYieR9yZbQD6TVmZZi+A 3CJq22dmacQsacN3y0jr76C7r+eClwdzASamcGEWWgEHa2vXgNXcF66DzrdWky6YEoPNLyn hmYr0iPV1kwk2TX/pV8lgzwGvA54/BYcKoy4+z9JDnN9zRr6FaI5RkVtakmg== Received: from [172.19.0.2] (unknown [172.19.0.2]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTP id 2EEF168FE86; Thu, 20 Nov 2025 05:27:11 +0200 (EET) ARC-Seal: i=1; cv=none; a=rsa-sha256; d=ffmpeg.org; s=arc; t=1763609229; b=QiOnHiqV0QDECm2TSA/hFUuqtDQwATtpChngiuT/9anJTnwM5sJpHhaZR8ZIKpKOVZjvE 7fYprhriH6TIai8wnbgbHgCWnZlCZmsSQRWRqEY1tKyRB5U7dZqXFNz0fiN3Y9y2NVGTuxp 3XO7csqPoRdo8/2x9N6XCFblV9APmWFV5F5UzWkLQlgaOH8F5oA5Ea8qUzEtNfMqK55cent cdNr0htUd8WVuuH1xP06yZ52YgpGVgo9BrXTXxA4vvdpjWr/FwPIWccTonbbds3+0Ash//b cTjBTdTIwUMZ2SAfZ4VvbhQt+CQD4ynrH5EuiuVv91/AR9YZU0T+ohfXF7Kg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=ffmpeg.org; s=arc; t=1763609229; 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=2snUSX0zNxzl9A+5dVkg7OeabfDEmQofrufkaoZmTZM=; b=FsS1+isuKbZgAltwCETe1WOCNJVzKsuRE6gDapoaP6zkkG1xAThn0GK/QVhJPY5V6KsEQ HuH1N1+HynNC4ODcKeF2O8niK0NjoqFxAI99hTZRV+Z8Pz1mSLXdngsMm6gTf7x5Ij6W4nQ 2OGMl9S5F9Ib0JMalc+v5QXaf4E/2VHvkETkdIBrHWGirDUlLiRM0QNEQtFQlo82bnHaXHC sJQsPi3Sf3hrc6cKD6KRUIJH2GIRVb44yfOjVNam2TOZVPXoyAsm01uxXPq+cBgRw69CL81 YIQneGTcE1JwBsTSe33wM1e76iHQ8df825ybo/gsTDMrcjTa5r3Zpqk+TVOA== 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=1763609223; h=content-type : mime-version : content-transfer-encoding : from : to : reply-to : subject : date : from; bh=SJa39HMHWFYvADhenHVi32TFwhiv67gb39kI3GFzANk=; b=XKPqZ4Oh+4rJh3SdNkNtEF5lqRhxeC7Q19SGRaC/gAkUPFi+CfynHuSs/zOrAzQUfG2Wa pJkI4TSKQV0kX/kWm+EkDx6Eni9GKb/yz0JKy1RmidtMK/fNNBIa4siqKaUXhU3IPiBZL2F ZWcnjpJvY/t4UH5+na04eK1wqADop7PytsKX7em9/MC0JS/sKWfRGcy9affN1B69LjZGL49 4usKME7hUuGcSM46w6f5gxjtui+oju7Bt9sfTK+LHwAq6KKg/zty8qOGGEwz3HCeEOg9wVH m/WiNolHWzBdv8O+msCMHiUfGycLaML+UIenYsr6iLTw06rt1kazAu+MLIIg== Received: from 188d6d40ca7a (code.ffmpeg.org [188.245.149.3]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTPS id 4CCB868FE77 for ; Thu, 20 Nov 2025 05:27:03 +0200 (EET) MIME-Version: 1.0 To: ffmpeg-devel@ffmpeg.org Date: Thu, 20 Nov 2025 03:27:02 -0000 Message-ID: <176360922344.59.16690253543503316461@2cb04c0e5124> Message-ID-Hash: WVFTVTYETNIHPK333EOMO7MA4HWUOXFN X-Message-ID-Hash: WVFTVTYETNIHPK333EOMO7MA4HWUOXFN 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] [release/8.0] avformat/mov: fix missing video size and relax check on proj box size (PR #20977) 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: Zhao Zhili via ffmpeg-devel Cc: Zhao Zhili Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Archived-At: List-Archive: List-Post: PR #20977 opened by Zhao Zhili (quink) URL: https://code.ffmpeg.org/FFmpeg/FFmpeg/pulls/20977 Patch URL: https://code.ffmpeg.org/FFmpeg/FFmpeg/pulls/20977.patch >>From 70e3fbb6484c171d0fa3b6d466865adc2c7332e6 Mon Sep 17 00:00:00 2001 From: Zhao Zhili Date: Tue, 28 Oct 2025 15:43:46 +0800 Subject: [PATCH 1/2] avformat/mov: relax check on proj box size Pico VR adds a '\0' after projection_type (a real C string than a fourcc). It's not strictly correct, but doesn't affect parsing. [prji: Projection Information Box] position = 149574743 size = 17 version = 0 flags = 0x000000 projection_type = rect Co-Authored-by: Keven Ma Signed-off-by: Zhao Zhili (cherry picked from commit 0734d1c55aedaf2df4a51488f9b75e42daf9f707) --- libavformat/mov.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/libavformat/mov.c b/libavformat/mov.c index b29c41a6b6..ea95d75155 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -6844,15 +6844,17 @@ static int mov_read_vexu_proj(MOVContext *c, AVIOContext *pb, MOVAtom atom) st = c->fc->streams[c->fc->nb_streams - 1]; sc = st->priv_data; - if (atom.size != 16) { + if (atom.size < 16) { av_log(c->fc, AV_LOG_ERROR, "Invalid size for proj box: %"PRIu64"\n", atom.size); return AVERROR_INVALIDDATA; } size = avio_rb32(pb); - if (size != 16) { + if (size < 16) { av_log(c->fc, AV_LOG_ERROR, "Invalid size for prji box: %d\n", size); return AVERROR_INVALIDDATA; + } else if (size > 16) { + av_log(c->fc, AV_LOG_WARNING, "Box has more bytes (%d) than prji box required (16) \n", size); } tag = avio_rl32(pb); -- 2.49.1 >>From fa959739bfd391b37f6400cd2f84405896d086d3 Mon Sep 17 00:00:00 2001 From: Zhao Zhili Date: Wed, 8 Oct 2025 23:31:11 +0800 Subject: [PATCH 2/2] avformat/mov: fix missing video size when some decoders are disabled Fix #20667 Signed-off-by: Zhao Zhili (cherry picked from commit 6b961f5963d8e362137702d38a744b45fba8ba3a) --- libavformat/mov.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/libavformat/mov.c b/libavformat/mov.c index ea95d75155..f3945c2be2 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -5242,16 +5242,22 @@ static int mov_read_trak(MOVContext *c, AVIOContext *pb, MOVAtom atom) #endif } +#if CONFIG_H261_DECODER || CONFIG_H263_DECODER || CONFIG_MPEG4_DECODER switch (st->codecpar->codec_id) { +#if CONFIG_H261_DECODER case AV_CODEC_ID_H261: +#endif +#if CONFIG_H263_DECODER case AV_CODEC_ID_H263: +#endif +#if CONFIG_MPEG4_DECODER case AV_CODEC_ID_MPEG4: +#endif st->codecpar->width = 0; /* let decoder init width/height */ st->codecpar->height= 0; break; - default: - break; } +#endif // If the duration of the mp3 packets is not constant, then they could need a parser if (st->codecpar->codec_id == AV_CODEC_ID_MP3 -- 2.49.1 _______________________________________________ ffmpeg-devel mailing list -- ffmpeg-devel@ffmpeg.org To unsubscribe send an email to ffmpeg-devel-leave@ffmpeg.org