From patchwork Fri Sep 21 16:32:26 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nick Ryan X-Patchwork-Id: 10428 Delivered-To: ffmpegpatchwork@gmail.com Received: by 2002:a02:1286:0:0:0:0:0 with SMTP id 6-v6csp47278jap; Fri, 21 Sep 2018 09:32:53 -0700 (PDT) X-Google-Smtp-Source: ACcGV60/bqMFh957iEXu0xi9oTUC0sLMfIV8pjobXYxEpsY7IUaIbZyohXyUUmW09NEpy5UITffG X-Received: by 2002:adf:f6cc:: with SMTP id y12-v6mr2816544wrp.201.1537547573516; Fri, 21 Sep 2018 09:32:53 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1537547573; cv=none; d=google.com; s=arc-20160816; b=d4PS7ImLCiexyMP/ijKS04CcrX2ersPvKl613jNRL6aAgEc2VP/l5zJ+JmKgsRvKtO fgDv9xOz5GhzcGc+0CKcui7IpY/6a+jgEj7mEojmf9ggMGLplEA5/SMCR+X9FuQCJZ4K rHQEUUUaSsdMeDTbMvXbeFvdD4WemBJP8oTm2DQ3DFch2y1l7IKO6AvLnWA23eLpj0t/ GmLzmHufKh25L6JqZ+5jzrn1r9QYeOdt3KTwixm+mr+VLr5cNVYTqHeHmgXIGdcwbXzb a6fkwvtkMMhzMZ6XFBir/lWVWfVaSV0dchqF4kOcJ+dZF88X3g5OaHxqTrb7o0nv5Oiz Tpfg== 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:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:dkim-signature:delivered-to; bh=qsA21XsgPKsJ+wiSvkjneOWr5oDwk5rrasedPnqNZcs=; b=kuYFJH6K7FcCNiJ6ort6QT9563oIGI70ycJvnpW5m1dQZZJHfY8Go3/eno6W0fBvht WO7XW5MVpkIquT+w7eVSAongTJa9JA65pH71nbAgY37+wPO7tCpZwiY14IANlwaQNnLz L5bBwZp4XYLIm73UjwIuUjooFRe8j9E3CYLb9YoC6BkF6aQTeupYJCZhjO+9xmh5ScJG Aa0MLkledTHvZctJaQvHOPjsezxvkmDPsm/5N8cSzmmb7/T6f6GkM3j7VQtMA3CDaXHY ySz1gGoJkPNSNgwxz4LzVeL3F9CZdohdsGpNWnnx/+dagw2ds8ULJBnZb9/pzHN9r18l RF9g== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=CtQkA+oH; 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=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id b65-v6si227559wma.94.2018.09.21.09.32.52; Fri, 21 Sep 2018 09:32:53 -0700 (PDT) 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=@gmail.com header.s=20161025 header.b=CtQkA+oH; 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=QUARANTINE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id C64E468A72C; Fri, 21 Sep 2018 19:32:36 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f68.google.com (mail-wr1-f68.google.com [209.85.221.68]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id CCB1C68A711 for ; Fri, 21 Sep 2018 19:32:30 +0300 (EEST) Received: by mail-wr1-f68.google.com with SMTP id j8-v6so9724469wrw.5 for ; Fri, 21 Sep 2018 09:32:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=MMxFJx16+a9MJ98jtePLqkVxIuBBwdOTTg2UHjFhtNA=; b=CtQkA+oHjaHUvxqt2E9uPc6X3d91Rdyl1tEzrK9dpUiM5I+mbiAiDrIAxW3AC+SAke 4c/YD4wtTp2Wvv1j6Zg449fyJRA4NTXp6rG3bpCu6haH0GGW74nc3ZVOoZFNWv+hUoa8 BEtwDzSxOp/6HhCtFxW1B0mSw0DJk2z0THBlqt47Joz5VIwrRJlncQd3/4NBe2fabhtL QcHDQgb2usuyA82vKCTth/S1JayCfE+HhNYnWdBIH44MSvQiyxFP/6rctsEFyf6CmAoP /Y5dXsOlVWnqlzUuxUDZ0Dc40LpAQWfqGa2kHIF3mcGlgi/8jTqaZQndKkBT+Z0f4VGw Oc2Q== 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:in-reply-to :references; bh=MMxFJx16+a9MJ98jtePLqkVxIuBBwdOTTg2UHjFhtNA=; b=m/OokEYpi5PQT6I6PCiR2shQksrwwgsXKfE3HRgVdxgM5X1Un830k2wPfyrkNgUtok IIcL0CBOWf5EHBsebwBNL1HGJziE9zvXE1ND0xUSVc9Ga0fk5GD2c06DkG9oMccSEzdL 3w5D0BO+WjKi5LxR+88juzb2MYPgzAUiSKipUs3TaIbw9Cvkci10YeJjl3fhM1+gelJG fsI93aKCfgF7Pyihb+pStLQcv/Nq6aEX4QKDkceFXtQmLg7dQy2Kp5+Q2KzcFfMmB9ya tJ2hv4WtIwq2V+32eEZfrfhURl1kn88M7YQ0ccjj9VVG5262M/CRVwhFYI7homjdxVC/ m24A== X-Gm-Message-State: APzg51BbmowAWEB+Anp8D+KkBDpCjTkgpyq/kWRDwCtUzx5OXnClKusB cNho8leRMFgf9MCJoUqag8bvd9BY X-Received: by 2002:adf:b519:: with SMTP id a25-v6mr40113975wrd.273.1537547564248; Fri, 21 Sep 2018 09:32:44 -0700 (PDT) Received: from localhost.localdomain (33.88.155.90.in-addr.arpa. [90.155.88.33]) by smtp.gmail.com with ESMTPSA id r30-v6sm34043004wrc.90.2018.09.21.09.32.43 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 21 Sep 2018 09:32:43 -0700 (PDT) From: Nick Ryan To: ffmpeg-devel@ffmpeg.org Date: Fri, 21 Sep 2018 17:32:26 +0100 Message-Id: <20180921163226.4872-2-nick.paul.ryan@gmail.com> X-Mailer: git-send-email 2.17.1 (Apple Git-112) In-Reply-To: <20180921163226.4872-1-nick.paul.ryan@gmail.com> References: <20180921163226.4872-1-nick.paul.ryan@gmail.com> Subject: [FFmpeg-devel] [PATCH 1/1] fix - increment index_entry_pos after log statement so that logs for index entries derived from trun atom use correct index 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: Nick Ryan MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Signed-off-by: Nick Ryan --- libavformat/mov.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavformat/mov.c b/libavformat/mov.c index ec57a05803..540e5ca057 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -4856,11 +4856,11 @@ static int mov_read_trun(MOVContext *c, AVIOContext *pb, MOVAtom atom) sc->ctts_data[index_entry_pos].count = 1; sc->ctts_data[index_entry_pos].duration = ctts_duration; - index_entry_pos++; av_log(c->fc, AV_LOG_TRACE, "AVIndex stream %d, sample %d, offset %"PRIx64", dts %"PRId64", " "size %u, distance %d, keyframe %d\n", st->index, index_entry_pos, offset, dts, sample_size, distance, keyframe); + index_entry_pos++; distance++; dts += sample_duration; offset += sample_size;