From patchwork Sun Jul 4 16:13:14 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Manolis Stamatogiannakis X-Patchwork-Id: 28760 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a5d:965a:0:0:0:0:0 with SMTP id d26csp3421016ios; Sun, 4 Jul 2021 09:37:02 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyiEP7nV4IA7TYsTt2JxhJTe/A1OW06Lc6zCIrquJx27i+OFa+igaOoec++bdLux92DD4wa X-Received: by 2002:a17:906:4d41:: with SMTP id b1mr8821283ejv.239.1625416622556; Sun, 04 Jul 2021 09:37:02 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1625416622; cv=none; d=google.com; s=arc-20160816; b=N/5d9raoaDPlaKunpt+3Rwzit1epmOs07mvcVU4ZSq4OKjbSQ5g5orvly/z/F+djJ7 9XI/NHYFQqRysWnX4Ke1i02o9SO7qKYbg1rk2zfS6Ch6kyIM3McpSRP3W822RWK2oKE5 fArJUdfsEMvWeOtbKYcAUVjE4XiwiG3uMob8fyEOKLygGXV9+Q8pTCi6F1uXDY/w4288 gVqiSqgOUCBumZepNlriJ32omvoSZoSmYgnrP7I8DoJYZpzE+zWE+kS5JwQ3sT/JUTBE OhGAJt0bMLUnN4EpHxdfH5LJNSJGYGboHNUdzTWYMqJzwcsXCW1rR/D77cXCa3EtUpg8 vaYA== 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=UVySl7bmLtpwB87BTmJZ68/LZVpvoj2aMP5EOzYkK4I=; b=NMJf94lY4FDTszylpPegaIAvGhlQPM1IxqYTVnvIQKt+xtHOrKumaO6DEPAHR37/QN fFiDdFfscBL/ukp+2xWxaU+B+EyRGqQfzS5/+ypsYqUykFWXfg4p2J7eXZKcrcn4Yyi0 Yviek+QMc6HlXPZeSlLIU8+I/Ifoxsc/9c9fdFHfw4Fw4ry5CTbX+bgev6K4P8e2GZMY 8xEp06Dr9Iq5MFBGkRXNFPqe5Grshds0jSQ99kU4Znoqa3O2zoEcSLG/DcCyo1dEinRL AE7JGtITIAnZv/vh0CjpJZd4FBVCei08P8+14BkxB/S0TbnmJBnQlim14d+5H6ECAMi0 VlNQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=u4hyVDxI; 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 z6si8675935edc.353.2021.07.04.09.37.01; Sun, 04 Jul 2021 09:37:02 -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=u4hyVDxI; 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 5B6AA68A3B0; Sun, 4 Jul 2021 19:36:58 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ej1-f41.google.com (mail-ej1-f41.google.com [209.85.218.41]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id CAD46689CCC for ; Sun, 4 Jul 2021 19:36:51 +0300 (EEST) Received: by mail-ej1-f41.google.com with SMTP id nd37so25163170ejc.3 for ; Sun, 04 Jul 2021 09:36:51 -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=et/9aSRp4DAPGNRCxkDYFmEhQXvDHsSQm31BUiMN3gg=; b=u4hyVDxIdPH6K1xemjX4tOJXEXs4iFbgGUuR7vwRMKfDOQOHv7c4gxh8sS8Mx1+zvR GOn1jTm7f8ZdtyRgNuGmd61lKoyijqaHWbrcFPM7CBwiB1ibYy9OiIS888e5XVEzr32a pBwonCTsTV/YvBwuaIUFi2u34Khb4KiAe6OP892rghUNnq9cxjU4JQlz4PsWJ2WpwPWI OofDy2Xu0cH6O8dvkHSy7EOP2RWjL0g6+zkFEFViQg/o/gxVeRe0F30Ly8op/HetOwRt B1Eh5EVqrmNROrb3LcGfoxUCMbp8FkBDL+JSkjU+XE9hQo9Z0wa+QGjmIqAaFKanD9lZ tleg== 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=et/9aSRp4DAPGNRCxkDYFmEhQXvDHsSQm31BUiMN3gg=; b=ZNbd0DqAJD0fjp/JbwTTQVOH3mfXWi/e2ow6d+I6t3bLxBgUtDqoxdJlyNwKi8Gik2 t6E4SjoNqWeWYEPAgflE501ikOgI2xTyiWGGD4UzwzgHVitWfOBXEUwZxocYrQEn+DBV BNo1akZjuZzUhNHYCdPxLVkaVeqO2qCI6FlWiGgJ457HgrzHqdXAHvzSSXksJbD/Fzbt yAIhKKxuN1mdx1qe+LUmZKAO5uA4wrObuAE25KndzAJwF/aHcbst+awikLUTwaIYax/f jxeC4cHRHQkf/DHfGboWXm1PDMeKQv6wd2jcnF1gJ3tBre6QXNk5pyImrLoO3AwFzJa3 7vww== X-Gm-Message-State: AOAM531lvYhpG/+wUt2KwSwUpxHiPFZDUgosgt7u28eP5sq4Z2oK5Dtm H/676LIYtzapxklzsfyOm8T9mN59JAjtgg== X-Received: by 2002:a17:907:8693:: with SMTP id qa19mr9322747ejc.189.1625415205295; Sun, 04 Jul 2021 09:13:25 -0700 (PDT) Received: from wasteland.vu.local ([145.108.189.179]) by smtp.gmail.com with ESMTPSA id f6sm3186022ejx.124.2021.07.04.09.13.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 04 Jul 2021 09:13:24 -0700 (PDT) From: Manolis Stamatogiannakis To: ffmpeg-devel@ffmpeg.org Date: Sun, 4 Jul 2021 18:13:14 +0200 Message-Id: <20210704161315.25031-1-mstamat@gmail.com> X-Mailer: git-send-email 2.17.1 Subject: [FFmpeg-devel] [PATCH v1 1/2] avfilter/vf_subtitles: Reorganized subtitles filter options. 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 Cc: Manolis Stamatogiannakis MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: me4Wa6k35vTo Some options are common between subtitles/ass filters. Rather than mentioning for each option whether it is common or not, the options are now displayed in two separate tables. Signed-off-by: Manolis Stamatogiannakis --- doc/filters.texi | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/doc/filters.texi b/doc/filters.texi index eaf23e3736..61c4cfc150 100644 --- a/doc/filters.texi +++ b/doc/filters.texi @@ -7093,6 +7093,7 @@ This filter supports the following @ref{commands} that corresponds to option of @item planes @end table +@anchor{ass} @section ass Same as the @ref{subtitles} filter, except that it doesn't require libavcodec @@ -19467,7 +19468,7 @@ To enable compilation of this filter you need to configure FFmpeg with libavformat to convert the passed subtitles file to ASS (Advanced Substation Alpha) subtitles format. -The filter accepts the following options: +Common @ref{subtitles}/@ref{ass} filter options: @table @option @item filename, f @@ -19486,13 +19487,16 @@ These fonts will be used in addition to whatever the font provider uses. @item alpha Process alpha channel, by default alpha channel is untouched. +@end table +Additional options for @ref{subtitles} filter: + +@table @option @item charenc -Set subtitles input character encoding. @code{subtitles} filter only. Only -useful if not UTF-8. +Set subtitles input character encoding. Only useful if not UTF-8. @item stream_index, si -Set subtitles stream index. @code{subtitles} filter only. +Set subtitles stream index. @item force_style Override default style or script info parameters of the subtitles. It accepts a