From patchwork Wed Mar 2 18:40:22 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicolas George X-Patchwork-Id: 34586 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6838:d078:0:0:0:0 with SMTP id x24csp4904250nkx; Wed, 2 Mar 2022 10:41:09 -0800 (PST) X-Google-Smtp-Source: ABdhPJxsHXyYHJIpRX18lMQSWub6cqI8fKt84J6lfwJp41w5dLeocxI6KCvESgvSZabkt/9cOtnu X-Received: by 2002:a17:907:2d06:b0:6da:688d:9668 with SMTP id gs6-20020a1709072d0600b006da688d9668mr2752624ejc.19.1646246469380; Wed, 02 Mar 2022 10:41:09 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1646246469; cv=none; d=google.com; s=arc-20160816; b=yMYpDRyAtjr72Gvs4N64PDfZqG8sGw4KICb/3Mj0j75ToHUYLx6ayznoqD3IktVO/s wDsUTZkha5pst0J/K2XYtsywm4I14XbPdyGWLfe6aERxoi/uLSFouR+glQLZi+7Xw4/Y znUFWHE0AoaLzxmCKbouDFK9OSTTUprGGGH0RJzFi8vMxOsO8bO4k5KBE23Nnmgr0IHh WMXMr9mxUPAKZ+M753B+QBs8Szbdx0oP/LpAWu36VeDPNVxg9Asu2TgENDXeFgXloB4E 6X9yeprFFjR9L2yns9cla52SbA98MprOcfw9W8NfxM3rKSILELIlgvAoSI2wQ1FksI1b /4IQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:references:in-reply-to:message-id :date:to:from:delivered-to; bh=hmH3Zlwzc7t9ZDhwjlfX0Q3il03rYXd3qUmcCDCX4zY=; b=jonKUcJMuC7nteQkM1VWOFZhJqMDtkK+FU+Vk4JgOnW4aePVdMhplC0eNWHm24GC/0 FbgYaWPTqRLWIZ4RrABMCtPeTdcCuCfp+ZMI/I0ldYRJv3UY9avvwJk+b4rrnwHlhPQM a4AwCgTdXsviLNCgV8Yx2wNmelWysVPwkHHXS9WG0hcW/8Z20FQ0wj+hAIFgl0BSPlLQ 178jKwMvhFASP0rTwHoIpo5XRgoc+/7n+HjQbwJWf4MD/d0leCVE2t3cAIUX03GiV5ss S3okOHAnOUruyuZVCB7A3lt5HHVGGxS7OJTT3gQHCMN6C9g3jEjumrvZb/LtI5KGkmXt mGqg== 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 z11-20020a05640240cb00b00415c5b25e91si1301065edb.596.2022.03.02.10.41.09; Wed, 02 Mar 2022 10:41:09 -0800 (PST) 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 A3E1968B368; Wed, 2 Mar 2022 20:40:34 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from nef.ens.fr (nef2.ens.fr [129.199.96.40]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 2BF8E68B327 for ; Wed, 2 Mar 2022 20:40:26 +0200 (EET) X-ENS-nef-client: 129.199.129.80 ( name = phare.normalesup.org ) Received: from phare.normalesup.org (phare.normalesup.org [129.199.129.80]) by nef.ens.fr (8.14.4/1.01.28121999) with ESMTP id 222IePKg010658 for ; Wed, 2 Mar 2022 19:40:25 +0100 Received: by phare.normalesup.org (Postfix, from userid 1001) id 5B027E62AD; Wed, 2 Mar 2022 19:40:25 +0100 (CET) From: Nicolas George To: ffmpeg-devel@ffmpeg.org Date: Wed, 2 Mar 2022 19:40:22 +0100 Message-Id: <20220302184023.285022-4-george@nsup.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220302184023.285022-1-george@nsup.org> References: <20220302184023.285022-1-george@nsup.org> MIME-Version: 1.0 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.4.3 (nef.ens.fr [129.199.96.32]); Wed, 02 Mar 2022 19:40:25 +0100 (CET) Subject: [FFmpeg-devel] [PATCH 4/5] lavfi/(a)format: support slash as a delimiter X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: muek4/MXKXl3 Unlike pipe, slash does not require escaping. Signed-off-by: Nicolas George --- doc/filters.texi | 8 ++++---- libavfilter/internal.h | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) Same as sent earlier today. diff --git a/doc/filters.texi b/doc/filters.texi index 8cba7f744d..ac3091c010 100644 --- a/doc/filters.texi +++ b/doc/filters.texi @@ -1590,13 +1590,13 @@ It accepts the following parameters: @table @option @item sample_fmts, f -A '|'-separated list of requested sample formats. +A '|'- or '/'-separated list of requested sample formats. @item sample_rates, r -A '|'-separated list of requested sample rates. +A '|'- or '/'-separated list of requested sample rates. @item channel_layouts, cl -A '|'-separated list of requested channel layouts. +A '|'- or '/'-separated list of requested channel layouts. See @ref{channel layout syntax,,the Channel Layout section in the ffmpeg-utils(1) manual,ffmpeg-utils} for the required syntax. @@ -12811,7 +12811,7 @@ It accepts the following parameters: @table @option @item pix_fmts -A '|'-separated list of pixel format names, such as +A '|'- or '/'-separated list of pixel format names, such as "pix_fmts=yuv420p|monow|rgb24". @end table diff --git a/libavfilter/internal.h b/libavfilter/internal.h index 74037e5eb9..df94b9f3b3 100644 --- a/libavfilter/internal.h +++ b/libavfilter/internal.h @@ -411,7 +411,7 @@ int ff_filter_init_hw_frames(AVFilterContext *avctx, AVFilterLink *link, */ static inline char *ff_formats_list_find_delimiter(const char *str) { - return (char *)str + strcspn(str, "|"); + return (char *)str + strcspn(str, "|/"); } #endif /* AVFILTER_INTERNAL_H */