From patchwork Sat Dec 24 17:41:44 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicolas George X-Patchwork-Id: 1908 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.89.21 with SMTP id n21csp383557vsb; Sat, 24 Dec 2016 09:42:55 -0800 (PST) X-Received: by 10.28.159.143 with SMTP id i137mr9344360wme.75.1482601375610; Sat, 24 Dec 2016 09:42:55 -0800 (PST) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id g198si10003397wmg.47.2016.12.24.09.42.55; Sat, 24 Dec 2016 09:42:55 -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; 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 Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id CAF71689BEF; Sat, 24 Dec 2016 19:42:10 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from nef2.ens.fr (nef2.ens.fr [129.199.96.40]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 232D76899BE for ; Sat, 24 Dec 2016 19:42:07 +0200 (EET) Received: from phare.normalesup.org (phare.normalesup.org [129.199.129.80]) by nef2.ens.fr (8.13.6/1.01.28121999) with ESMTP id uBOHg8mo095814 for ; Sat, 24 Dec 2016 18:42:09 +0100 (CET) Received: by phare.normalesup.org (Postfix, from userid 1001) id EEAD3E0087; Sat, 24 Dec 2016 18:42:08 +0100 (CET) From: Nicolas George To: ffmpeg-devel@ffmpeg.org Date: Sat, 24 Dec 2016 18:41:44 +0100 Message-Id: <20161224174149.8995-13-george@nsup.org> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20161224174149.8995-1-george@nsup.org> References: <20161224174149.8995-1-george@nsup.org> X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.4.3 (nef2.ens.fr [129.199.96.32]); Sat, 24 Dec 2016 18:42:09 +0100 (CET) Subject: [FFmpeg-devel] [PATCH 12/17] lavfi: move ff_update_link_current_pts() into the utility functions. 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 MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Signed-off-by: Nicolas George --- libavfilter/avfilter.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavfilter/avfilter.c b/libavfilter/avfilter.c index 3927e7f7ac..6d24f74c08 100644 --- a/libavfilter/avfilter.c +++ b/libavfilter/avfilter.c @@ -1116,7 +1116,6 @@ static int ff_filter_frame_framed(AVFilterLink *link, AVFrame *frame) filter_frame = default_filter_frame; ret = filter_frame(link, frame); link->frame_count_out++; - ff_update_link_current_pts(link, frame->pts); return ret; fail: @@ -1515,6 +1514,7 @@ int ff_link_check_available_samples(AVFilterLink *link, unsigned min) static void consume_update(AVFilterLink *link, const AVFrame *frame) { + ff_update_link_current_pts(link, frame->pts); ff_link_process_commands(link, frame); ff_link_process_timeline(link, frame); link->frame_count_out++;