From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id AB00C409F8 for ; Sat, 25 Dec 2021 08:46:27 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 0147568B0B2; Sat, 25 Dec 2021 10:46:14 +0200 (EET) Received: from out162-62-57-64.mail.qq.com (out162-62-57-64.mail.qq.com [162.62.57.64]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 3461A68B009 for ; Sat, 25 Dec 2021 10:46:06 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foxmail.com; s=s201512; t=1640421958; bh=ZYXQeSnQPDEzRxcfmxNWL5NC2fB3iTR+OXG4oCMJyy8=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=NKHczTxSZJqn8E8XnlxnBkl+eDC9xzXdvZ9Cl3na3hWGlpTx5xGCYLA/s48/+mBJk VkROLLWNgN6O1ZxlvDtp5FLVMo8aT7zFiw6Fj6BoYIuaGRpj10mzgqx9YaMAS0QTkz lYj1ANoLNp3tBwDWY86qkqyjBNaddoF+53cE+56k= Received: from ZHILIZHAO-MB2.tencent.com ([113.87.131.148]) by newxmesmtplogicsvrsza5.qq.com (NewEsmtp) with SMTP id B78A5C6C; Sat, 25 Dec 2021 16:45:56 +0800 X-QQ-mid: xmsmtpt1640421957tfe10hnyv Message-ID: X-QQ-XMAILINFO: MbkhVtI1PGVkwFRudLQjnNvcjzfc3xBA4cn9vIJGPyiNiAWplqMyxVMtveKAat kORB06nLO0BNW5Ga1JA9bTWG6wK0dRqe6bmfpQ7tDeAiLsDIYFxZjK/klgy1Mn+waes+xeB8gVAC m+8nsQcDgXh58Z52eG/bETU/J2j3HFmgLBwFC6g1SiTRCqlZ07FomLRecIaMxVwrpl91xMFzTiWw /08WyhkwYfQ7XjDrzHbIp48Xq4J552/l8dYc4KTvpUYYYeZag3+Yj7c+ZnTcqk+pvACXs3kKaQbb tn53zaDM3W5XZ25mGPyxOIGO7ZLE3KvcRgzTKWYQ2/zmGCUQOG5u5HGrXFZc1qJQcvRkwOddgn3o HItnUSEWv3QtPuAvGENcO1Res1z7NKvD0gk2xkanmO2A0IwubYTyH7eQ0En3aHHP1q8JTyWRknrl VFuMXC/i0fQUL8gGz9PQjQU26kCiHhpd8aNUVJMk3k/bViRDir4y24Xuy3ZiezdKP2NldKtdndXK a0TW/H5SsABffSj3KaJyOje69vj+ZcbpTHBACT6IMmB0arz+6shP6r2O5hMZed0IOQFl0aJBLloZ uURThZI5emAQa7T6cepLGMxFFBcUBoezF2TcqFPt7HWqLATlWmHMXSiah8jgHIHHCKaIvV05PEeW THeT+qLX+ymnjTj7jAX/Jmw4j3IrT3NGNMgy5kjDs49SFWPbwrgOgc+mGUHYDe02WgVD4okI9Fth S4CF3DNX7MQ/FFscG12pjRb6zpeCRsjEu9ovTWRlRaUwMwCxsPlD4z0glXCgFnME19PoxrDE3Cip eyZc5kEJQsC8ZUj6P6lWoKTDgb4OZNFJUsq+gU17bdVzg/JbCt9xVKCdYoyRO/Yz+8cJHQ6ku5i4 5S31qZZejg From: Zhao Zhili To: ffmpeg-devel@ffmpeg.org Date: Sat, 25 Dec 2021 16:45:54 +0800 X-OQ-MSGID: <20211225084554.43114-2-quinkblack@foxmail.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20211225084554.43114-1-quinkblack@foxmail.com> References: <20211225084554.43114-1-quinkblack@foxmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2 2/2] avformat/mov: take hoov as moov only in the second pass 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 Cc: Zhao Zhili Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: Fix #8883. --- libavformat/mov.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/libavformat/mov.c b/libavformat/mov.c index ea2f010aa0..5787a20124 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -7324,8 +7324,9 @@ static int mov_read_default(MOVContext *c, AVIOContext *pb, MOVAtom atom) if (atom.size >= 8) { a.size = avio_rb32(pb); a.type = avio_rl32(pb); - if (((a.type == MKTAG('f','r','e','e') && c->moov_retry) || - a.type == MKTAG('h','o','o','v')) && + if ((a.type == MKTAG('f','r','e','e') || + a.type == MKTAG('h','o','o','v')) && + c->moov_retry && a.size >= 8 && c->fc->strict_std_compliance < FF_COMPLIANCE_STRICT) { uint32_t type; -- 2.31.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".