From patchwork Mon Sep 9 01:49:30 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jun Zhao X-Patchwork-Id: 14982 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 8035B449894 for ; Mon, 9 Sep 2019 04:49:44 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 5AF1F681868; Mon, 9 Sep 2019 04:49:44 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pg1-f178.google.com (mail-pg1-f178.google.com [209.85.215.178]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 49A35680133 for ; Mon, 9 Sep 2019 04:49:38 +0300 (EEST) Received: by mail-pg1-f178.google.com with SMTP id d10so6848720pgo.5 for ; Sun, 08 Sep 2019 18:49:38 -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; bh=+lyFYX4UlaqslhETBP5jea2wvfnc9OvQc3zDvAjVjOU=; b=PQDXqLI2KZMSDHSvgp2kG52TkxxRWk3E2pLLTgkDRV+HuVd31VZURfkrgyWo1J4qjh dDlvcZQiuDq7LJqn2Myv9wutKtPZXs0jVxHIupS0490k/U5JoGHkZUnUItZn3N4+61ym FSSMzR4kP4wCUVz6Utwg25T+LF57W5A7dC7qTw22dRsMDWDSUoCVleLzLlqzgEuNv1Dh qfKtj8a0DPJ03t5sfOlscQ/UtT28FWp5Kg+Ogx4Z9Oqm59q08HtjiCBot6nA9vQqw+oG 1SHIQSqMfOnRlT0OoB1Frg/3nJPg1VwUl2HdSQjGTpdqsAnPMudM5vs1T2P0ftq+bq/3 3vBg== 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; bh=+lyFYX4UlaqslhETBP5jea2wvfnc9OvQc3zDvAjVjOU=; b=nUFzXIIXLkFBJthKYhRHWaiZW88lYceHDxtj6ojZ50YvRujo/r/4InhaE+7fLxitJH zHb1PsDbjB/ySvGRPeHf/z28YVCnMjNNiWYUsx4taXCfpcEtf1fLbVV4tAjEmmRSTqaE zBThc9pcVdseIeeF4GP0VKkwiQoh46SCwwchYZHG6Uq83O5/ArjLpd98+cnyY1QW9xER yflzJi34pxyItgXLcdhBZ/V3fY7ihObecosYKBQKmVv/hlHi8jfNWBBmTFZDRVqutq+s 7J1hPQd6u9hBkkofVWddVQyu16ZY14ovZDGOoVdjlP1ZRaXFflqA7jKtbrbxIkFKBWAo zTuQ== X-Gm-Message-State: APjAAAXL1lE22VznC1GMLHlSH4uZMP9QcqrXTppDImesWLTPG38GQ+tj BL4wYnxHHyqFav0Ni/7b0A0mFwcd X-Google-Smtp-Source: APXvYqxMrw/dTi5k96mm6l/pEw8eJf1lIlJMu7WaFXqBApqy7wxW/Wg1EaefObCw3JEXYWKdwx4yeg== X-Received: by 2002:a63:188:: with SMTP id 130mr18959154pgb.231.1567993775944; Sun, 08 Sep 2019 18:49:35 -0700 (PDT) Received: from localhost.localdomain ([47.90.47.25]) by smtp.gmail.com with ESMTPSA id k14sm13696342pfi.98.2019.09.08.18.49.34 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 08 Sep 2019 18:49:35 -0700 (PDT) From: Jun Zhao To: ffmpeg-devel@ffmpeg.org Date: Mon, 9 Sep 2019 09:49:30 +0800 Message-Id: <1567993770-11166-1-git-send-email-mypopydev@gmail.com> X-Mailer: git-send-email 1.7.1 Subject: [FFmpeg-devel] [PATCH V1] lavfi/concat: fix logic error in framerate check 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: Jun Zhao MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From: Jun Zhao fix logic error in framerate check, it's introduced by commit 3ad5d4df9ce794d3eeb0f526c5f3e446bf97c616 Signed-off-by: Jun Zhao --- libavfilter/avf_concat.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/libavfilter/avf_concat.c b/libavfilter/avf_concat.c index 2791859..28bd540 100644 --- a/libavfilter/avf_concat.c +++ b/libavfilter/avf_concat.c @@ -136,7 +136,7 @@ static int config_output(AVFilterLink *outlink) for (seg = 1; seg < cat->nb_segments; seg++) { inlink = ctx->inputs[in_no + seg * ctx->nb_outputs]; if (outlink->frame_rate.num != inlink->frame_rate.num || - outlink->frame_rate.den != outlink->frame_rate.den) { + outlink->frame_rate.den != inlink->frame_rate.den) { av_log(ctx, AV_LOG_VERBOSE, "Video inputs have different frame rates, output will be VFR\n"); outlink->frame_rate = av_make_q(1, 0);