From patchwork Fri Dec 1 23:26:03 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 44854 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:a301:b0:181:818d:5e7f with SMTP id x1csp1445931pzk; Fri, 1 Dec 2023 15:26:24 -0800 (PST) X-Google-Smtp-Source: AGHT+IFQDDDhH9wOPuiHdOvrPcKbfPpvSmAyuFOE4R4vRVBiNZRtr66O1scUnX0+msrcrnONlpP+ X-Received: by 2002:a2e:8ec1:0:b0:2c9:d862:ff1b with SMTP id e1-20020a2e8ec1000000b002c9d862ff1bmr642275ljl.60.1701473184520; Fri, 01 Dec 2023 15:26:24 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1701473184; cv=none; d=google.com; s=arc-20160816; b=foS4rl6RiUqsdSWYT7jn/gvw2lv4MhzKLOWMgDsQuBu1gWhPvgguYZuRSN17jBbeka 7hCWj/urn2tFSVrHII2LzDEXClLWKOZ8UvJIGr/poJ7M/oMqnj6kasLO9JXcv1jcDknm 8dKZd217h/ZGAraSCFeTXOGVEptKSGMSAw/d2g3bQcwf9hNrHwIm6fscQpA/MfNRGq6B VcdoeD5PGVjQmLTg7s3IHshPjCR9oAXhRbZYb3naOfb2WmDQQ8YNy5Nt0FtZT4MgU33R d2/qAHjWkHP+oJF1o2PMS5AGK0pxXazWd4FYBdfOaFHjreyJJvNV83T3J90M6VRBp4DV +f7A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:message-id:date:to:from:dkim-signature :delivered-to; bh=MgOiJmCZKw1FGZOTbr6V87YNPKh0+TSdqalUyR97qtc=; fh=e5zN9xSzcxLA6bGo3lF+CqTbY/oLwzApV03EO/RBfgQ=; b=edtOds8J8xBCaOjW5mnlAAz/IE/Hz1Sh0EuDbE16zmR/chY0KEnGGu9D9qt+wNINfy QZjWKX/KNa+3adjT1biGLPadamj48gzsqPf6x8v7DiHejhwmFUMecwcVs3pj8LCX0pAq +jOdSdDiT/UMKTJnmRTWS/nlL+1Ui+Inp0gqJutFvwUvnfNYqVxqsKk1BMMqvvK1Sm5p G9HvY/zb0MVFpaAtyDDUu+mwvpFinW4nMf6LSzzWIxNXuIAcN53qLa2k6GvQGArYHRk7 nDmK3vk17mq8uA6masf6cmnHcOAn5482j0JlU8npJeFazHxicSC2wJJsPoAbNs0jIsmJ gF1A== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@niedermayer.cc header.s=gm1 header.b=DL9CDO76; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id ss20-20020a170907039400b00a1749fdf383si2156406ejb.814.2023.12.01.15.26.13; Fri, 01 Dec 2023 15:26:24 -0800 (PST) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@niedermayer.cc header.s=gm1 header.b=DL9CDO76; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 9549168CCDE; Sat, 2 Dec 2023 01:26:11 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from relay4-d.mail.gandi.net (relay4-d.mail.gandi.net [217.70.183.196]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C787468CB33 for ; Sat, 2 Dec 2023 01:26:04 +0200 (EET) Received: by mail.gandi.net (Postfix) with ESMTPSA id 02FF9E0002 for ; Fri, 1 Dec 2023 23:26:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=niedermayer.cc; s=gm1; t=1701473164; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc; bh=0AzgyvqFmscGGFlJ60DZuPs0ic4QP+mu5DM58FxDIXk=; b=DL9CDO76y41pPbtpabtLWHIENPYT1rxEbikQEzS2KoZRctHdStubSJej+r5zFa8tEcfWlf l8HYQvhEK+zfMHuk8B0J/X0snsjDXDALOBGJ5Gc3UP9Lt5slEshIl3sMW1elizpDksBpBT znchKm8X782Tr4DRtDYLCMmMHlpVZABnJ88xQUtxTj4cWeiHh1bXyTatac2JVL0WY+lsWb FGLMN5jrXJIBEzj7ok+Lt/MQh3RE/pwHBpfsUYfs1aIZL5czYvptAYtsQhAnMTgK9XICHx ze8mqa65fobOjzzVzlVdOGI5biBXwwsZBk91hWLn5MZXu85tusRwubTrFxBjCQ== From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Sat, 2 Dec 2023 00:26:03 +0100 Message-Id: <20231201232603.31423-1-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 X-GND-Sasl: michael@niedermayer.cc Subject: [FFmpeg-devel] [PATCH] avformat/mov: Ignore duplicate ftyp 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 MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: xkmFgwnhyKA3 Fixes: switch_1080p_720p.mp4 Found-by: Dale Curtis Signed-off-by: Michael Niedermayer --- libavformat/mov.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/libavformat/mov.c b/libavformat/mov.c index f7b5ec7a352..fb5d6f49138 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -1222,8 +1222,10 @@ static int mov_read_ftyp(MOVContext *c, AVIOContext *pb, MOVAtom atom) int ret = ffio_read_size(pb, type, 4); if (ret < 0) return ret; - if (c->fc->nb_streams) - return AVERROR_INVALIDDATA; + if (c->fc->nb_streams) { + av_log(c->fc, AV_LOG_DEBUG, "Ignoring duplicate FTYP\n"); + return 0; + } if (strcmp(type, "qt ")) c->isom = 1;