From patchwork Thu Apr 25 19:16:01 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul B Mahol X-Patchwork-Id: 12910 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 CD32D447B6A for ; Thu, 25 Apr 2019 22:16:17 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id A797E68A640; Thu, 25 Apr 2019 22:16:17 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f65.google.com (mail-wr1-f65.google.com [209.85.221.65]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id DB4EF6801D8 for ; Thu, 25 Apr 2019 22:16:10 +0300 (EEST) Received: by mail-wr1-f65.google.com with SMTP id f7so940306wrs.2 for ; Thu, 25 Apr 2019 12:16:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id; bh=ILado2AuCWZTU9HGF61E6KSpVi+aeh99E+/CYjtHQA8=; b=AvN9yZoweHW1V2x2fy2ZZ0q5AzgDtd3xHd1jyivTDSPr1vD89EkNiNcUUgS9pJWSyh 3PNxY/SX4NlMHlInImp/5qBsIpVTQMim9CR+O+640IF0ZvSYLxZKsfv66Zom7bSEynfu 8Yl1gmfyuV7mVOIGnu+rebVn5PotuGhR/upEcGa1fbuDpo8+gocTuWErh1f+TnwEKnD8 DQ9PzkeXNIvfEktWlX88xkfZmF2aTN70k+U0RVHGS5yzA41swHJ4ogpd7a7SfRerV9vZ 9BAnqpKBicChX3pjqJ8sMqkM+7oqK8H57GsRPUNfCGGHR0Z44jqikIxxdZwNdjUR/bG1 mKPA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id; bh=ILado2AuCWZTU9HGF61E6KSpVi+aeh99E+/CYjtHQA8=; b=IA98nO6efld2RLRGSTaMYI5mfkPeHLPxgcbGUtyfri0/8tWoRzKVUTqZrEXdJgqw+D aXJT8pKNaS2BFrkSkZhbam2eU1fuNF79VB2QsfXctP052pox/mRqTjzW6eptQ4KkOiIk fEwocTZ2EFGs1MYXGDLwjjwJ5yWBZ+BEeDm+0bZzstAK3bQ3zGmAHjoiXvGlVogEWqaD lq06c5lNGthPOC6XRg5GinDu4KdKRllwgJN0L1owMmED2Wn6dzhkZJDnXyPgq/BAlbR2 trvzTzD2BbfasVuUsKGKf5q4BK8Zkumavz74AvJ2Xq6OKUwUf0Es6PTzu+K4UQiRyXGe r+pw== X-Gm-Message-State: APjAAAVeOHagkNfEukoH8zXag9VXlCi+7iC31c2axjxwbmqAMSAeTA+C bZjbRVV+WkeCBvcE3ffB3X8NANDl X-Google-Smtp-Source: APXvYqznXnKE3y9vWaCbHd5cEYWE3Mv/ID4N2jWjJIh7/e+QGsnLS+7wfIAt4VvH8bO6XNoYDJmnuw== X-Received: by 2002:adf:9e86:: with SMTP id a6mr17527139wrf.178.1556219770204; Thu, 25 Apr 2019 12:16:10 -0700 (PDT) Received: from localhost.localdomain ([37.244.238.255]) by smtp.gmail.com with ESMTPSA id h84sm25401376wmf.15.2019.04.25.12.16.09 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 25 Apr 2019 12:16:09 -0700 (PDT) From: Paul B Mahol To: ffmpeg-devel@ffmpeg.org Date: Thu, 25 Apr 2019 21:16:01 +0200 Message-Id: <20190425191601.20660-1-onemda@gmail.com> X-Mailer: git-send-email 2.17.1 Subject: [FFmpeg-devel] [PATCH] avfilter/vf_stack: use time_base from framesync 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" Fixes non-monotonous timestamps. Signed-off-by: Paul B Mahol --- libavfilter/vf_stack.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/libavfilter/vf_stack.c b/libavfilter/vf_stack.c index 8731674aa7..b836d96bf0 100644 --- a/libavfilter/vf_stack.c +++ b/libavfilter/vf_stack.c @@ -174,7 +174,6 @@ static int config_output(AVFilterLink *outlink) { AVFilterContext *ctx = outlink->src; StackContext *s = ctx->priv; - AVRational time_base = ctx->inputs[0]->time_base; AVRational frame_rate = ctx->inputs[0]->frame_rate; AVRational sar = ctx->inputs[0]->sample_aspect_ratio; int height = ctx->inputs[0]->h; @@ -281,7 +280,6 @@ static int config_output(AVFilterLink *outlink) outlink->w = width; outlink->h = height; - outlink->time_base = time_base; outlink->frame_rate = frame_rate; outlink->sample_aspect_ratio = sar; @@ -301,7 +299,10 @@ static int config_output(AVFilterLink *outlink) in[i].after = s->shortest ? EXT_STOP : EXT_INFINITY; } - return ff_framesync_configure(&s->fs); + ret = ff_framesync_configure(&s->fs); + outlink->time_base = s->fs.time_base; + + return ret; } static av_cold void uninit(AVFilterContext *ctx)