From patchwork Sat Jul 11 11:21:54 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jun Zhao X-Patchwork-Id: 20961 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 00B9544BC99 for ; Sat, 11 Jul 2020 14:29:11 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id D2DA06880C5; Sat, 11 Jul 2020 14:29:10 +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 330B76880C5 for ; Sat, 11 Jul 2020 14:29:04 +0300 (EEST) Received: by mail-wm1-f68.google.com with SMTP id f139so8397468wmf.5 for ; Sat, 11 Jul 2020 04:29:04 -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=nzYZep4gr1GURZvhiydS3dkkmGKPB0pv4f26b1Slk8M=; b=NvPQvIq0N2byxp2Jk0hpx3CUILEIICbcdX5jWTLmIZPWfxt8xvij9LYaEMkB1+eOc6 XO2qNR7peMri0amnSBNCKFw5SFMbUN/eGQkTZ/bXE3/DR7G7Ohb2/IAv4s4ctW9HyGPl wnTkhGrlj6g3x08uie1D7YiVmSBdnYdI0LgQvndXwxXow+lNfB7o01DGBmDCSlU5SbX/ jKrP5ntvT+y+Cmma+c2kQlIQRchLPt+nUOzkYBjBqjEb5R6iaSOul4jBIpNPfouDikI5 j/m6wzJ6MUc7pkSE2en1YCjMN4JmIaGZNKnEch5elqPnVa1QSoMI1u7xVA2Pec+q0cr0 Bodg== 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=nzYZep4gr1GURZvhiydS3dkkmGKPB0pv4f26b1Slk8M=; b=Qx6MI8mt8qOIp68xSJ8fC1/bwGMlaYXyIAhc0HaCMrx8ql4jHSHZkU2Kr12HBaNrWk NCtHnRx1eVCnLO2NSCz9pzXyxml6cFvy/NP7d2f+wvh17zdMbAVPiw5I0miXVYbGjseB IKp4c/Mvv1w8EYvpEnn4bN7nV34HGsbXWC37Ph7RSiFsQ79VwSRRLp+7j3DyROe6qfiF y7Wj/Nahq9wBtG0JSk4FscdCn/7eV+s75m/zGP9hSZx/jNLjXx5jMPHf2cJO3j7QURdp DshxULLu6ctDuOoMtC+SBjwZ2T0xcV+OGeFPzPVq158OV+My59Z0kigu656l2exznXKc AR0w== X-Gm-Message-State: AOAM532+HPMORnTJqTkpyKEfZl9l4NKevro2gk+AIbo9Slm8yF6fUqWC UGA0K0hhRXs5PeWNX3z6dq5skmkS X-Google-Smtp-Source: ABdhPJxucjh1W4JIPTGYIR3nwmenIvh66jhKGsEzCOorwsH4FWjdBM637mVIJOVFyrFz4Irdd9iQLA== X-Received: by 2002:a1c:2257:: with SMTP id i84mr9428710wmi.158.1594466519364; Sat, 11 Jul 2020 04:21:59 -0700 (PDT) Received: from localhost.localdomain ([49.51.162.193]) by smtp.gmail.com with ESMTPSA id x7sm14813964wrr.72.2020.07.11.04.21.58 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sat, 11 Jul 2020 04:21:58 -0700 (PDT) From: Jun Zhao To: ffmpeg-devel@ffmpeg.org Date: Sat, 11 Jul 2020 19:21:54 +0800 Message-Id: <1594466515-32524-1-git-send-email-mypopydev@gmail.com> X-Mailer: git-send-email 2.7.4 Subject: [FFmpeg-devel] [PATCH v2 1/2] 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" From: Jun Zhao fix the command ffmpeg -h filter=setpts/asetpts both dump the expr option with "FVA" flags. Signed-off-by: Jun Zhao --- libavfilter/setpts.c | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/libavfilter/setpts.c b/libavfilter/setpts.c index 6506653..440a218 100644 --- a/libavfilter/setpts.c +++ b/libavfilter/setpts.c @@ -262,14 +262,15 @@ 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 -static const AVOption options[] = { - { "expr", "Expression determining the frame timestamp", OFFSET(expr_str), AV_OPT_TYPE_STRING, { .str = "PTS" }, .flags = FLAGS }, - { NULL } -}; +#define V AV_OPT_FLAG_VIDEO_PARAM +#define A AV_OPT_FLAG_AUDIO_PARAM +#define F AV_OPT_FLAG_FILTERING_PARAM #if CONFIG_SETPTS_FILTER -#define setpts_options options +static const AVOption setpts_options[] = { + { "expr", "Expression determining the frame timestamp", OFFSET(expr_str), AV_OPT_TYPE_STRING, { .str = "PTS" }, .flags = V|F }, + { NULL } +}; AVFILTER_DEFINE_CLASS(setpts); static const AVFilterPad avfilter_vf_setpts_inputs[] = { @@ -306,7 +307,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[] = {