From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id 290E2438B8 for ; Tue, 2 Aug 2022 16:55:08 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 35C1468BADB; Tue, 2 Aug 2022 19:54:37 +0300 (EEST) Received: from nef.ens.fr (nef2.ens.fr [129.199.96.40]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 8E05868BA34 for ; Tue, 2 Aug 2022 19:54:28 +0300 (EEST) 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 272GsRCM017577 for ; Tue, 2 Aug 2022 18:54:28 +0200 Received: by phare.normalesup.org (Postfix, from userid 1001) id CF7F5EB5BC; Tue, 2 Aug 2022 18:54:27 +0200 (CEST) From: Nicolas George To: ffmpeg-devel@ffmpeg.org Date: Tue, 2 Aug 2022 18:54:19 +0200 Message-Id: <20220802165421.137563-5-george@nsup.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220802165421.137563-1-george@nsup.org> References: <20220802165421.137563-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]); Tue, 02 Aug 2022 18:54:28 +0200 (CEST) Subject: [FFmpeg-devel] [PATCH 5/7] 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 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: 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(-) Identical to the one posted months ago. diff --git a/doc/filters.texi b/doc/filters.texi index 4a5412c91d..e334ac0e16 100644 --- a/doc/filters.texi +++ b/doc/filters.texi @@ -1693,13 +1693,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. @@ -13379,7 +13379,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 6dbe7ecee0..cfb748f7db 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 */ -- 2.35.1 _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".