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 4F98B47B29 for ; Fri, 1 Dec 2023 23:26:12 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 5659A68CCB4; Sat, 2 Dec 2023 01:26:11 +0200 (EET) 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 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: 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; -- 2.17.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".