From patchwork Mon Jun 29 13:21:41 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jun Zhao X-Patchwork-Id: 20721 Delivered-To: andriy.gelman@gmail.com Received: by 2002:a25:80ca:0:0:0:0:0 with SMTP id c10csp2813261ybm; Mon, 29 Jun 2020 06:28:19 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyY3dU/VJY1HyanrjudJun1PnSWKJ79koVbL/S/ItcOLIFJkdua/FzqpDhKPb7SaezwvYk2 X-Received: by 2002:adf:c185:: with SMTP id x5mr18527150wre.403.1593437299627; Mon, 29 Jun 2020 06:28:19 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1593437299; cv=none; d=google.com; s=arc-20160816; b=ms5PnYIwoLeeX2UverKpMVo2668504e3++BlzzoNN62lL6w/9KvoEGXY+NBqQ7zras kVbk+V38v2HnPu79l0h2hkIz4XU7w2o/ttny00Fvzhm/9+tpMbSCpg3n+PcemVdHhwin XbeHXFjVCcxtVHu93nRvVvIJvCeBLuySASZulyqG3PmQAe//enEIzCGhKCmTVeoaEQlP GTKTHqUHnA6bFqWKUdlKrQlSSAGrRUs4ZFliVSopUBSVQhzyDSbJYS27i/Rawoo2lFY3 nIdwE0bUm+wGHXVpVvY5T5rfU4TPlm3Twa+lsIvr9wA5VtJ4x7mvGaL00VeopXG1z3Im XX/g== 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:message-id:date:to:from:dkim-signature :delivered-to; bh=TkL8mA51v9PWwpTRUhcLq7Gap40sCf+/TXFWLouySS8=; b=B2BoSND5473/Nmdqz7etMA22owJTIKVflNmnPEwPlr+a+nsovpgFGFLFZnuHi3BEpF w8eiaqi9PXXXWZ8Z8hnt+4FrKCnNt1jWQlf7CvZlhhdrcnNDaly5YfPPTFkZcxhxEuh+ 2gtdTx22mEXYJLeBbppx+zA26wjPdnGEZF0DOOWikQ0g6241UDHzSTxLf977b60VMMZ2 0YF5z5ju9fwk4lDD/ibvo5IE0eZ76HOeJrj/5Uw84o5Z/SKwWriPfxPY57AkBgiFfuKb iJovo2j/xBsqzr0/Dt6o/n4RjwNz01VKjpE48d2TDpbMCZHoxn2m6zbT+jsz707Y0FuF 9UBw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=LJM+a5Ok; 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 r3si18077030wra.482.2020.06.29.06.28.19; Mon, 29 Jun 2020 06:28:19 -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=LJM+a5Ok; 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 BEED668A454; Mon, 29 Jun 2020 16:28:14 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f68.google.com (mail-wm1-f68.google.com [209.85.128.68]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 73E5E688112 for ; Mon, 29 Jun 2020 16:28:08 +0300 (EEST) Received: by mail-wm1-f68.google.com with SMTP id j18so15387212wmi.3 for ; Mon, 29 Jun 2020 06:28:08 -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=bTZvTaOYdhSXBMLJX8BnjSBwHtyiH7P+i2cgFoWfjGc=; b=LJM+a5OkejLNQDpVVzlV9qC2LP7RGWE/Eci3kjCZocsedBD90qtQNRBNap3NC+aCya ys/KVan3k+0rjOY4Zxtner119KHZbh2pu3RlBXBLkTDfTKjwHijeHe3NASxmOmWVjCpg v/SeOzSz9rSF/hloP1LeHDjW7ghMw1pBStvrB1WLA8RYjz0KMeIeCJ1m4ueOCa5YpqRg Ysr7gLrl5SHvUIgUjQLl6LSZ8nkQtFw8E8yY4pEYu/vN0UvvgshmIVsYXx+WtOW9BDsA 6eQF35awvA4XuIdWscSoxsq6p22A6hvFrIE7r7l+OJWmDLEGDAiibH/1tvg90xGEdsV3 76Dg== 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=bTZvTaOYdhSXBMLJX8BnjSBwHtyiH7P+i2cgFoWfjGc=; b=LHMDISpsgrSyiBfk0qXHYQp9iSsuoWK44UEiXIAW0AooI0DOsk5JZKHgYEmhNMAb1U Jb/i6duVloWyJ8XGqm672XCblxYBI0AdQRXSUkr2ohVn6+FP7nIgWaYDHWG1TwrEVf/H FVYeV7LCj0vEXlUCRds/Oc78Tt6onGd2vTXoPWg2VLWW6GjsHYz0hrNWBq0+6LR8WpZE rSQUXw/DA1egK9E1EjQullXKJJWjX7WJEahTI/7Cr360vNkPYjBeu2k5v8N8iGqOkTkK p15i9Br6EtleEhcGgSrlrRYH6iYpjlZNotMc6fiyzmrckOfQKeE9MgEjXpM5bIXS1Kwo n1aQ== X-Gm-Message-State: AOAM532n3pc71Vas3s/GSF2DmCklRjzvcLnj6DHtr7FHdhQmGhfxQD+d 9cKriiT2UinTNkUdAj8mQnp0ohHD X-Received: by 2002:a1c:5f45:: with SMTP id t66mr17606235wmb.144.1593436906833; Mon, 29 Jun 2020 06:21:46 -0700 (PDT) Received: from localhost.localdomain ([49.51.162.193]) by smtp.gmail.com with ESMTPSA id d13sm33385169wrn.61.2020.06.29.06.21.46 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 29 Jun 2020 06:21:46 -0700 (PDT) From: Jun Zhao To: ffmpeg-devel@ffmpeg.org Date: Mon, 29 Jun 2020 21:21:41 +0800 Message-Id: <1593436901-19675-1-git-send-email-mypopydev@gmail.com> X-Mailer: git-send-email 2.7.4 Subject: [FFmpeg-devel] [PATCH] lavfi/setpts: fix setpts/asetpts option dump error 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" X-TUID: vfk8CLXVhtXS Content-Length: 2319 From: Jun Zhao fix the command fmpeg -h filter=setpts/asetpts both dump the expr option with "FVA" flags. Signed-off-by: Jun Zhao --- libavfilter/setpts.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/libavfilter/setpts.c b/libavfilter/setpts.c index c7c3836..8547514 100644 --- a/libavfilter/setpts.c +++ b/libavfilter/setpts.c @@ -266,9 +266,11 @@ static av_cold void uninit(AVFilterContext *ctx) } #define OFFSET(x) offsetof(SetPTSContext, x) -#define FLAGS AV_OPT_FLAG_VIDEO_PARAM | AV_OPT_FLAG_AUDIO_PARAM | AV_OPT_FLAG_FILTERING_PARAM +#define V AV_OPT_FLAG_VIDEO_PARAM +#define A AV_OPT_FLAG_AUDIO_PARAM +#define F AV_OPT_FLAG_FILTERING_PARAM static const AVOption options[] = { - { "expr", "Expression determining the frame timestamp", OFFSET(expr_str), AV_OPT_TYPE_STRING, { .str = "PTS" }, .flags = FLAGS }, + { "expr", "Expression determining the frame timestamp", OFFSET(expr_str), AV_OPT_TYPE_STRING, { .str = "PTS" }, .flags = V|F }, { NULL } }; @@ -310,7 +312,10 @@ AVFilter ff_vf_setpts = { #if CONFIG_ASETPTS_FILTER -#define asetpts_options options +static const AVOption asetpts_options[] = { + { "expr", "Expression determining the frame timestamp", OFFSET(expr_str), AV_OPT_TYPE_STRING, { .str = "PTS" }, .flags = A|F }, + { NULL } +}; AVFILTER_DEFINE_CLASS(asetpts); static const AVFilterPad asetpts_inputs[] = {