From patchwork Thu Dec 1 21:40:29 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chris Ribble X-Patchwork-Id: 39563 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:999a:b0:a4:2148:650a with SMTP id ve26csp741416pzb; Thu, 1 Dec 2022 13:41:19 -0800 (PST) X-Google-Smtp-Source: AA0mqf6yBXNQyH+yjM2RgkTYvCYieRQRgmlKVL1xi/QXg+fsisz5MIGxwaZ0VsEJpDjEruL+Qqx8 X-Received: by 2002:a17:906:50f:b0:78d:ad5d:75e with SMTP id j15-20020a170906050f00b0078dad5d075emr58512422eja.172.1669930879137; Thu, 01 Dec 2022 13:41:19 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1669930879; cv=none; d=google.com; s=arc-20160816; b=Fe4rp2gvbS6hekuXO0eTq4Qw75sOqZGSSNXe6YqiXpcGCUoK33ScZVjbgORF6ChgjD RRCZntwjoYEajNI398jlk37f/zAeqvf8NHpsEhEYOtMeBtmLnOt4x2p98FT7TqdjtxQI oKl2yW4XNxOyqI82H1MwJlZj/00OI9hcS/BZgNzkI3N2zgjNk4HHFbeQfL0zm2PpfftE Eh35PMic8fmI+EMkmj74LgKu5KaHy7d9MN4Z48Abc9hOx6xIPwCSewx7KnpzPcuWUH3I G9GZzjWAq9lxw/DuU96Ksai00S9ILqpJsDjwNtlXzkkjJzTfRPYLrOzABygQlkn+QbQE h30Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:mime-version:message-id:date:to:from :dkim-signature:delivered-to; bh=7tZRv2P2DQmkzqMPcwDLrE01mQv4gRcqH66gcfTemj4=; b=0AqCM2TDuXom60/e/s6e2J6rhBYoMF9JlM715aY4k4kmMFlFIai0uRgge74Jqx1rBI 7IQvrGnSRtFmfbnywTtgjIJ6VWcgbfwxD3yoXpwcDxKPsPbgZvOLSfp93Q+MrQN4FJ5n SDzPMjDJXj3P6PmHjnZr6juNZ/ONrrbciWmNaPSY9hBWl6X0QeGzsF0OUt8WrjqS92n1 jidTLciNlKRn2pDT56FOk/2qXrmP3MlngoSAGVT7OHz84Z7bofpRzrgNFbNj+llYGEt2 sDUVzklnuJRj/HSFOyg7QwaHrxjlfdzI5KMOceq5rtwohDaXpTfy6Y0QKiL7ZILkkidl rOrw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@resi.io header.s=google header.b=ZRgIuNqV; 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; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=resi.io Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id t18-20020aa7db12000000b0046ae21a2b20si4125339eds.455.2022.12.01.13.40.54; Thu, 01 Dec 2022 13:41:19 -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=@resi.io header.s=google header.b=ZRgIuNqV; 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; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=resi.io Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id E703F68A486; Thu, 1 Dec 2022 23:40:50 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-oa1-f44.google.com (mail-oa1-f44.google.com [209.85.160.44]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id EE40068B0DD for ; Thu, 1 Dec 2022 23:40:43 +0200 (EET) Received: by mail-oa1-f44.google.com with SMTP id 586e51a60fabf-142306beb9aso3657852fac.11 for ; Thu, 01 Dec 2022 13:40:43 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=resi.io; s=google; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=5AYzjPVWvaTiKpywn3h+hCX2p7L4CdT811GWGH1xdjU=; b=ZRgIuNqVWYQIh80fwXuzXY3gnjp9yEHAJmkEnNpQUIGEwPhOSE1pgzJvFmpcCqmkM7 zQ8oVc5ZDRzCpNWzst0r6duCFxzSaCxQ2vQcwTUsquLUjCaEFxz5vxG7FwroW77R3/k5 IuE98EkEDlEWfK7IA7OAxoY0uXsSl+55j30QbMS/MLDIRdEQ5laasg7phr6IEbKt+SKb wb9SBrz6ifRVyCcB28JaJ7D9pkcutyhoM36DmTQUNAsWn9AGO54VMtu3LW2Tvofvk3Kj FlsKAfzXzAJo8Q2te08UDzxpbtm+jKH1ZDtYpKMRRPhH2zl5jzHqWFpRHV+zJXaZDCKJ RlhQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=5AYzjPVWvaTiKpywn3h+hCX2p7L4CdT811GWGH1xdjU=; b=sYdTYUWyCxcUD9TzDCz9bfcEwJpUYfe39tATaawU4icm3aQj3K1zxV3Dh4xBvB2ZEo zUHhmVcd6hfGNHO5/gziiuNSboULJrOsh0+Nu70n3IkZiUVNlA+Eol3r1rDIdDX8bmdZ quPPNnx3OLq2Yzo2wNeoLROJQT4uMyk4sH5M++D8gR4U4aW+7C9Yd2t9hD5T1qj3YSdv MkwJWefUUOvQ56NGi8OQETecIUlZYKMjAalwK8eCst6LNCjHqYKFBjNjHEVTBxkg3L9O 4ELyWLtk09lR/Mixc6CoHfXOuPFBzxtHjQQUFFtjXClq6TMW4A5A0f0Sk4yTtd+ajG6g WWWQ== X-Gm-Message-State: ANoB5pkc6QIP4fhgM/3C3pbuVVhPRuefD4DmVDUH2S8pTzgdDfqpODm+ Egs8c0oVLs4KmSVEHr4Dc5Jo5QN0otfE6w== X-Received: by 2002:a05:6870:2054:b0:142:bd8f:2fb9 with SMTP id l20-20020a056870205400b00142bd8f2fb9mr27180800oad.195.1669930841111; Thu, 01 Dec 2022 13:40:41 -0800 (PST) Received: from hoth.ribblenet.woot.myvwan.com ([47.184.172.187]) by smtp.gmail.com with ESMTPSA id 125-20020a4a1583000000b0049ef7f3b2c8sm2197436oon.48.2022.12.01.13.40.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 01 Dec 2022 13:40:40 -0800 (PST) From: Chris Ribble To: ffmpeg-devel@ffmpeg.org Date: Thu, 1 Dec 2022 15:40:29 -0600 Message-Id: <20221201214029.24352-1-chris.ribble@resi.io> X-Mailer: git-send-email 2.37.4 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] Revert "avformat/mov: disallow a zero sample size in trun atoms" 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: Chris Ribble Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: WFFaXFZJ30LF This reverts commit 03d81a044ad587ea83567f75dc36bc3d64278199. This change broke the ability to read mp4 files which contain a trun atom with a sample of size zero (FFmpeg exits while parsing the moof). Signed-off-by: Chris Ribble --- libavformat/mov.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/libavformat/mov.c b/libavformat/mov.c index 29bd3103e3..b67b7cd9d2 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -5293,8 +5293,6 @@ static int mov_read_trun(MOVContext *c, AVIOContext *pb, MOVAtom atom) distance++; if (av_sat_add64(dts, sample_duration) != dts + (uint64_t)sample_duration) return AVERROR_INVALIDDATA; - if (!sample_size) - return AVERROR_INVALIDDATA; dts += sample_duration; offset += sample_size; sc->data_size += sample_size;