From patchwork Fri Dec 24 09:58:23 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhao Zhili X-Patchwork-Id: 32902 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp8014515iog; Fri, 24 Dec 2021 01:58:50 -0800 (PST) X-Google-Smtp-Source: ABdhPJyxSXO3OxdJ5cCiSMPmdMbNBqQKyxVfwBiDQPf/PYvUqNcZ9Oq/xBXCSV7ZkwbvoyongWI4 X-Received: by 2002:a05:6402:1a49:: with SMTP id bf9mr5182805edb.18.1640339929916; Fri, 24 Dec 2021 01:58:49 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1640339929; cv=none; d=google.com; s=arc-20160816; b=B2tZ7hKTencVkk+WF8S9bqe0LCvmcJOo0kQXrzo+dhmnN7+saMeGkr6WAlbAs0WArq 6dmJhPd2Mm0rzmEXgEWYtigajaPTbCv0WRzccS/TbpKFHHKHZiQsPcIL7EF+rNCfwSuf sGcAvvxIu6yJxdikXap32+HSHnqIXRUnwQaNkzTC/mHcmzVULvmFmpJrPIux9yZmA/Z5 s+TP7QFQasyHSBlRTSOOnCwSe0M/6ncinIdSfqnFJbznCKyltzmH9s6+WDp0tHjm5c+X U8FIeVHuIqeNKmao+27VLRSwg0UFMYX70qPUN5hXnK3YSJU3Elq3y5ZMhKqu7PMEHoYm /cfQ== 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:references:in-reply-to:date :to:from:message-id:dkim-signature:delivered-to; bh=MtwihmY9GYTe/+xEa/hcxzfIdQ/skjhjqTyAFwIsabs=; b=cVn5gia/vzFf02/VQouJB3imjwZgFpB9iPrXSotaNDyyeEQnY5cibqWMhnqvF9PgIq t0LG79guDEo6ezW+voUYuLMdVc3D1i3T1sVQbJLdT80efyAMNFK5fRtOSGoTxreufdUw cpGB/LKQ6b9DVtpS4N6123+inEl6045rI0NWma1ATyliz5IHwI+25ED7kGuGf7ig+FLB VOpZ0Rn8CbQXZgsmcx76rMazc6pjGQgbhSz9qMDTZyjBoCotL4AT740qvgfAjzPdjoAf eMhKm54M7m9hc2SHBMT7DFGCDu+72tRXsi3jUSNMYyKlYIh3YjrN8HJZHZiXnOY8+PUf 4o0w== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@foxmail.com header.s=s201512 header.b=Z79hVBfR; 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=foxmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id r24si3142793ejy.582.2021.12.24.01.58.49; Fri, 24 Dec 2021 01:58:49 -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=@foxmail.com header.s=s201512 header.b=Z79hVBfR; 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=foxmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 6622068B2C6; Fri, 24 Dec 2021 11:58:38 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from out203-205-221-155.mail.qq.com (out203-205-221-155.mail.qq.com [203.205.221.155]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 7AE6068B2A5 for ; Fri, 24 Dec 2021 11:58:31 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foxmail.com; s=s201512; t=1640339908; bh=dE+kjAZMDrw4wBxfdCnzhU4C0BQlEBSDYK9hQ18q2pk=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=Z79hVBfRWiNuV9EQFrawA/xYGMI6NKvX89KsY7iSo3WDHZCxTFJn9M7UYYI4Fer2e 5L6sPqsS0dwaFuH4BQYG9UZElkgBdgsWaEhaLO2+ATDSkPUN1l+6Oz7LLDGzQjQXf5 KGfZljeM9YLK0CSAbHkBTCMIn7dfwKPRp9A3NuKI= Received: from ZHILIZHAO-MB2.tencent.com ([113.108.77.59]) by newxmesmtplogicsvrszc7.qq.com (NewEsmtp) with SMTP id E99B5057; Fri, 24 Dec 2021 17:58:25 +0800 X-QQ-mid: xmsmtpt1640339907tknvn3z2v Message-ID: X-QQ-XMAILINFO: NojR6Ao/DkEDJEUxk6NIzDL018xeXbJhlQ385qv6DAF2HNhx2BLAAqHz2BBdJu hiWIrECawrO2nW+z1sraV/pV4fob5VA2w/9UYQAMDoPSe1udWERu4MQjWPEtF+EXUP2TZgGMzeWT bieRNxelRF9/HT4QWrmUfRKUTFCx/RS1kiy0kLT5usO8cfVEf3KCJYqinQiikLjawhNjPEHfc2bT 14dRElUEDl6NZLN0xlXDXIX1NAl24/RXqz1GWKEuTuJ4Z7LWhwQ3ANKhR3XU/Y9j/BeZa77VNPuy GM7gYI1L1T/x+gWC7Nb49RRxZA0f6n9UU3dghA7s/nnfpx25ycANWVwLPPC1pGSj1eFclwBheX9f FLfZVKNc1Jdygd2ttJD6oqiOkdBymZordUvCzhPgcatDvg7Z6J4Q/Dbr1y5Zao1b7lXsrqcr24GQ onYdXNa4P+Fkoc+U6WBHNBjcE8/QkhB/wmP5Ulsvy50RwMPHc65qx2lowyGQAVzOM5eBGYCGZ3h0 Ka5bKYh6lonlrU5GxDg8cyPUKu64v3KM8lDUl4hqyF5KlmnTEBsyMDIuoC4uKlSCpVlkhZs+6LIQ bS0q+cjXh2GxArFQ6yizn7TbVVN3MktUDVbvivWk6hy/dcqsDrR/P9z5wGgJwcyPgB51GWazdYEU rJWzI6v08XG4mb/tN4WM6OofuzJNM3q2zpyfivlaMuQKwCi31RL4MEnSKCtHIrBjkKh39Pf7LdXz zEeUij8lm6Aqwb6wfep+vbUPvdlZMeDMF3znclf9B2t/zqC7ePnkDZfugkTupJbXba1fKgPxH3Rl bh3n4MuPgXRPPozK1jUtqdWuGHpbJPLTrfKZFGfdrImnolqMJ8/bas8+14n1d24IFFIW4LuURiSL ALu7YBDmAGvXCeue4BWK2WGBvYijPE40E2fPRsFlX2 From: Zhao Zhili To: ffmpeg-devel@ffmpeg.org Date: Fri, 24 Dec 2021 17:58:23 +0800 X-OQ-MSGID: <20211224095823.58415-3-quinkblack@foxmail.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20211224095823.58415-1-quinkblack@foxmail.com> References: <20211224095823.58415-1-quinkblack@foxmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 3/3] avformat/mov: remove always false condtion 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: HY2s7AH7jSLY 203b0e35 made duration unsigned. --- libavformat/mov.c | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/libavformat/mov.c b/libavformat/mov.c index 63483740a0..636cfce400 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -3972,17 +3972,6 @@ static void mov_build_index(MOVContext *mov, AVStream *st) current_offset += sample_size; stream_size += sample_size; - - /* A negative sample duration is invalid based on the spec, - * but some samples need it to correct the DTS. */ - if (sc->stts_data[stts_index].duration < 0) { - av_log(mov->fc, AV_LOG_WARNING, - "Invalid SampleDelta %d in STTS, at %d st:%d\n", - sc->stts_data[stts_index].duration, stts_index, - st->index); - dts_correction += sc->stts_data[stts_index].duration - 1; - sc->stts_data[stts_index].duration = 1; - } current_dts += sc->stts_data[stts_index].duration; if (!dts_correction || current_dts + dts_correction > last_dts) { current_dts += dts_correction;