From patchwork Tue Sep 12 09:19:40 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicolas George X-Patchwork-Id: 5101 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.36.26 with SMTP id f26csp4055312jaa; Tue, 12 Sep 2017 02:19:50 -0700 (PDT) X-Google-Smtp-Source: ADKCNb7HOFDYkqeUqWCeXJhzgxEsFx0CbUohcDGcp+1BfMH5WiXW5YLnQ+1qE2+qiWMuVVjq81G6 X-Received: by 10.223.144.71 with SMTP id h65mr11495486wrh.41.1505207990055; Tue, 12 Sep 2017 02:19:50 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1505207990; cv=none; d=google.com; s=arc-20160816; b=qQv63Xayt/eYmMKnyZ+EkLHLY0D8pw780P11EfQHAk1EbWAwtAgB1D9bVG7Cx/mJ68 3Y4EqoXOzC4ZIVlVw5KXK7NzxmhOd1VLN/S3EIzGBMDlGLDG7OD5hUlGNVG1PfB1j7Be rRP2ago5eedgXQTOAkQ+2aFK1NsiatHLgc4XdQJVhWx+r5miFDTBNLYnKNC+yX5kiSMW aprHhUtTD4H1vQbl43E80Pp/zdTx/MH4AtsLCdMsgNwtjeCAOM4noH4CEUMgXyGJyKKD gtKRP1thsQ5uGzx1DGBud9t6keuiPfCoYOFqY0jMguKOboopr4EBs8WKLFmpxmjnDTH9 LwqQ== 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:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:message-id:date:to:from:delivered-to :arc-authentication-results; bh=W9znevbH7wJpyg8M3D6XyfF1r6UTJqTk5/s4C0R4FlY=; b=IPKzL0eZrUqHqa51YhiNFA0g8hbymvEcl5+gRKDqBKTjP0Up8M4F0Ud9w895JcBD60 jYIN+wWm+PaQsDeXBcnxl1M7SpKVf3QnGRAjFoukpNaAF4DrO2F8KY0h97NMrKYyA7FJ Oxugi6aWC2DN0t3wTQ3J2GrLFtQhMy4l1O92Ohf9399oGfwFKk04OGlP03EngYejhzbV Hu39qP5+KTjQpv0Jo8l+y/PXjBrXn2G2m66xkxk97zN3wZGheYGQpUgoFm/A6eMU1sIf 9MpBfPP1xxMr+ivSesjopE56YF0v1NuGfg+5qm0rF1Zd5CqywM5w4Gcn7gMSw8sAgpId ihNA== ARC-Authentication-Results: i=1; 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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id q14si8141340wrd.307.2017.09.12.02.19.49; Tue, 12 Sep 2017 02:19:50 -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; 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 D68ED689D29; Tue, 12 Sep 2017 12:19:42 +0300 (EEST) 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 54347689CCD for ; Tue, 12 Sep 2017 12:19:36 +0300 (EEST) Received: from phare.normalesup.org (archicubes.ens.fr [129.199.129.80]) by nef2.ens.fr (8.13.6/1.01.28121999) with ESMTP id v8C9JfFa097161 for ; Tue, 12 Sep 2017 11:19:41 +0200 (CEST) Received: by phare.normalesup.org (Postfix, from userid 1001) id 98BE0E00CB; Tue, 12 Sep 2017 11:19:41 +0200 (CEST) From: Nicolas George To: ffmpeg-devel@ffmpeg.org Date: Tue, 12 Sep 2017 11:19:40 +0200 Message-Id: <20170912091940.21634-1-george@nsup.org> X-Mailer: git-send-email 2.14.1 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.4.3 (nef2.ens.fr [129.199.96.32]); Tue, 12 Sep 2017 11:19:42 +0200 (CEST) Subject: [FFmpeg-devel] [PATCH] lavfi/framesync: reword repeatlast option help. 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 --- doc/filters.texi | 6 +++--- libavfilter/framesync.c | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/doc/filters.texi b/doc/filters.texi index 4111532512..830de54909 100644 --- a/doc/filters.texi +++ b/doc/filters.texi @@ -337,9 +337,9 @@ If set to 1, force the output to terminate when the shortest input terminates. Default value is 0. @item repeatlast -If set to 1, force the filter to draw the last overlay frame over the -main input until the end of the stream. A value of 0 disables this -behavior. Default value is 1. +If set to 1, force the filter to extend the last frame of secondary streams +until the end of the primary stream. A value of 0 disables this behavior. +Default value is 1. @end table @c man end OPTIONS FOR FILTERS WITH SEVERAL INPUTS diff --git a/libavfilter/framesync.c b/libavfilter/framesync.c index ebfbcaf090..5567d660ab 100644 --- a/libavfilter/framesync.c +++ b/libavfilter/framesync.c @@ -41,7 +41,7 @@ static const AVOption framesync_options[] = { { "endall", "End both streams.", 0, AV_OPT_TYPE_CONST, { .i64 = EOF_ACTION_ENDALL }, .flags = FLAGS, "eof_action" }, { "pass", "Pass through the main input.", 0, AV_OPT_TYPE_CONST, { .i64 = EOF_ACTION_PASS }, .flags = FLAGS, "eof_action" }, { "shortest", "force termination when the shortest input terminates", OFFSET(opt_shortest), AV_OPT_TYPE_BOOL, { .i64 = 0 }, 0, 1, FLAGS }, - { "repeatlast", "repeat overlay of the last overlay frame", OFFSET(opt_repeatlast), AV_OPT_TYPE_BOOL, { .i64 = 1 }, 0, 1, FLAGS }, + { "repeatlast", "extend last frame of secondary streams beyond EOF", OFFSET(opt_repeatlast), AV_OPT_TYPE_BOOL, { .i64 = 1 }, 0, 1, FLAGS }, { NULL } }; static const AVClass framesync_class = {