From patchwork Tue Oct 13 04:59:06 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chris Miceli X-Patchwork-Id: 22902 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id EC729449F56 for ; Tue, 13 Oct 2020 07:59:22 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id CA07068BB72; Tue, 13 Oct 2020 07:59:22 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pg1-f196.google.com (mail-pg1-f196.google.com [209.85.215.196]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 28B6268B9CE for ; Tue, 13 Oct 2020 07:59:16 +0300 (EEST) Received: by mail-pg1-f196.google.com with SMTP id o3so6719301pgr.11 for ; Mon, 12 Oct 2020 21:59:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=miceli-net-au.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=8gLUa/sleeCLVI4oIzOviI4ohmLBfcMQiL6xZcRqs+8=; b=YUPuZ27M2Wy4eDI3+gj3H7glS9cyY6MYJGTurPD6O/Uo7IqVH3SFRZuEzoh8R5PIa5 Rpd4uokIQJFZoEWdQUWlDP+Z7L1pIG3J0GSmYHIem4ZyyoDfwklU+X7cpertxm9OPqjs RpxeCcsVboiN2Cgj5zjg9s2cYS0uxIwttXcdddZ8CA2dClY+Yh4kEsiwdcUBLP3FigLH cYLgrzUlS4C+ZrJhx9Vsm04pCEzN9QWkGiKNyjFmcobqmbUh4lKwXX8eXsrBGSGYUj/h rpismmNKnulZ/tHrFYwwwTIYd7sfUtOeqayIPW8QlgpuUFDmScV1kK/HzU6pSmUngJ7Z 4gUg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=8gLUa/sleeCLVI4oIzOviI4ohmLBfcMQiL6xZcRqs+8=; b=pgd9475tY08vJ6xreiUn6O89+wrl1Y1El4JQ3MVmlImRdUllOQYPXNRR7R/HioKaP3 gbG7rv0UJMuOhcbFqkEraTrEOCA52CpWZxoOAcjdgqJsx/cNh8JH2iIwl1/wWmUbNLPI htryKFTo6ndSCMEb8DrqyxBz5pIf57/dLh7PG5kluze9b3CmTVc4dmzEkg6a5PoBgBek pc87+cnp7ZWNGxj5w++IB0nILFBH7YgF0U5gOud1H4d9G0NuuRxdpHqnQQ9ZcaRcWks4 phPymCHDkZR8MsR0/AFPhTFg0maF16nUUtmHH6k2RW4aViszcxwMcGmqlS/QU1fMloRx jmyg== X-Gm-Message-State: AOAM531jMxjQhkGqkgh6QbLqCwe6NHy/HeQlJXKL46yfk8bdapFmr+Ka CCV/Kiz2pThHQDlB1L/yVUO085vggK63UfYW X-Google-Smtp-Source: ABdhPJyw6n2t56WFkUBvyPyM4NB4vLmk38gRihwJHQ8V2TN9cDXxVFiQuuB8BT6TNzGFESH3haQ+fA== X-Received: by 2002:a17:90a:3fcd:: with SMTP id u13mr24122539pjm.85.1602565153723; Mon, 12 Oct 2020 21:59:13 -0700 (PDT) Received: from edna.localdomain (119-18-3-107.771203.syd.nbn.aussiebb.net. [119.18.3.107]) by smtp.gmail.com with ESMTPSA id s20sm21139089pfu.112.2020.10.12.21.59.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 12 Oct 2020 21:59:12 -0700 (PDT) From: Chris Miceli To: ffmpeg-devel@ffmpeg.org Date: Tue, 13 Oct 2020 15:59:06 +1100 Message-Id: <20201013045906.197610-1-chris@miceli.net.au> X-Mailer: git-send-email 2.28.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] libavformat/utils: Fix misleading indent X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 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 Miceli Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" 6f69f7a8bf6a0d013985578df2ef42ee6b1c7994 introduced this and it was part of a very large merging of refactoring. Current behaviour is what is reflected by this indenting change, however my understanding of timing is such that this correct behaviour. --- libavformat/utils.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/libavformat/utils.c b/libavformat/utils.c index a2e701ea1a..e8335a601f 100644 --- a/libavformat/utils.c +++ b/libavformat/utils.c @@ -1186,8 +1186,7 @@ static void update_initial_durations(AVFormatContext *s, AVStream *st, pktl->pkt.dts = cur_dts; if (!st->internal->avctx->has_b_frames) pktl->pkt.pts = cur_dts; -// if (st->codecpar->codec_type != AVMEDIA_TYPE_AUDIO) - pktl->pkt.duration = duration; + pktl->pkt.duration = duration; } else break; cur_dts = pktl->pkt.dts + pktl->pkt.duration;