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 1831540A04 for ; Sat, 25 Dec 2021 08:46:14 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id BA34E68B07E; Sat, 25 Dec 2021 10:46:11 +0200 (EET) Received: from out162-62-57-210.mail.qq.com (out162-62-57-210.mail.qq.com [162.62.57.210]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id F369D68B004 for ; Sat, 25 Dec 2021 10:46:04 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foxmail.com; s=s201512; t=1640421958; bh=vywEIqRLzGm0S8iXCR0Ps53LGtIkRvPc+J9BC31HSh0=; h=From:To:Cc:Subject:Date; b=kMthuXwkd4keMmlf7ZDcZW3CB061AyNRlyPSrkOMm6WvTMStwljNQCD7OimTELr6m KFDjTsK783iycWH3fN8KxZEysa68ywRSd1DCh/dZOFM2vDRvtWuKg+BQbqE0wFlfH4 9A6h6wxpx1i+S4Y2hQMt1lU+S0sn/YKKan98EXeE= 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: xmsmtpt1640421956t763y0ogg Message-ID: X-QQ-XMAILINFO: NhDhJCJPIfnTWNxaWVh/+nbZwaPV+P9VM9dN+5cIEbIJTD+ySH6zCcW8dNd8Ea JfGSJoZtd7str5DLzLbMv5xWA/7MeGiK7hQIKsdyX61sql4KRRr2Cg5m/KI7nZfYWn9LHI1U5KK5 Ddrzw6YLkN7n42BSa078qNHYOTOYdjzxFjo364dWT+vkHDKXjNknDtSncGLSP3WdSt+U6jsCQMoD mWigGauMP5LuA4RUBbI9o1+A+8r+MlSh3CG8o+ajOdJ090/w00muWL8OzCs02rYykBNSKJPP0Of3 VYVCc/AVBhKWGkX2wjREaaKWgJ/t0KmdJH/m34LneMY4Ft5vcJJ4VP+v3P28Tkbi6jh3dEkFxBSr zW+GVkAn+4BMmN8+dieUn833Mpu8QqCLMg5bPJQ5BQzoJSlI7m1JkGl++EILjrwlxWxq7b1hAV78 SnSow2gyZRG0vYVA72YpHs6xypIeGEFH5zbNge8N7ASKldfxgxntC1uGrTfe1/fLMAA79if0QULK PC37qhh5Pjgfd/c0I+9nJs04GPVILW7y4Njbb4yqm2Q+pIx3PHNXWNymk5/37jor1T61rFQCIx2S 5k4o+cYUMVD6n6edxiuHLE0kwKHEVPaFa1MwfzqPptlBydsPffHFET2WZabZebZjdO9YTXG0CJHI 1mm2XFYqpCfFApwsg1N6ylHHSGcTrPL4WwgC1D6p0972LV5CyWGKmRZEuDU211tL8UpzzyhkhnER jC76GHiVWb7O62Rdye42r1HU9aSFBVcafhlFjIy0hkKCJAYECMuynhjKTP5jxdT5JABpqZHSpnpn zXkVAgWiQ2ZZKoqYQAV7iv/604pf+EV2gP4w+jjT7gVdkb0gkDNdusMyvgCAdrCWvUQ6HYh5peNw == From: Zhao Zhili To: ffmpeg-devel@ffmpeg.org Date: Sat, 25 Dec 2021 16:45:53 +0800 X-OQ-MSGID: <20211225084554.43114-1-quinkblack@foxmail.com> X-Mailer: git-send-email 2.31.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2 1/2] avformat/mov: skip moof and sidx before found moov 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: It's required for #8883. VLC and quicktime player can handle the sample file. --- libavformat/mov.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/libavformat/mov.c b/libavformat/mov.c index 2aed6e80ef..ea2f010aa0 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -7366,6 +7366,21 @@ static int mov_read_default(MOVContext *c, AVIOContext *pb, MOVAtom atom) break; a.size = FFMIN(a.size, atom.size - total_size); + if (!c->found_moov) { + static uint32_t skip_before_moov[] = { + MKTAG('m', 'o', 'o', 'f'), + MKTAG('s', 'i', 'd', 'x'), + }; + for (size_t i = 0; i < FF_ARRAY_ELEMS(skip_before_moov); i++) { + if (a.type == skip_before_moov[i]) { + av_log(c->fc, AV_LOG_WARNING, "Skip %s atom before moov.\n", + av_fourcc2str(a.type)); + parse = NULL; + goto skip; + } + } + } + for (i = 0; mov_default_parse_table[i].type; i++) if (mov_default_parse_table[i].type == a.type) { parse = mov_default_parse_table[i].parse; @@ -7386,6 +7401,7 @@ static int mov_read_default(MOVContext *c, AVIOContext *pb, MOVAtom atom) parse = mov_read_keys; } +skip: if (!parse) { /* skip leaf atoms data */ avio_skip(pb, a.size); } else { -- 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".