From patchwork Sun Jul 5 13:05:35 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Manolis Stamatogiannakis X-Patchwork-Id: 20820 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 459CC44A18F for ; Sun, 5 Jul 2020 16:06:21 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 3252D68AFE9; Sun, 5 Jul 2020 16:06:21 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ej1-f42.google.com (mail-ej1-f42.google.com [209.85.218.42]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id ABDA168A08F for ; Sun, 5 Jul 2020 16:06:14 +0300 (EEST) Received: by mail-ej1-f42.google.com with SMTP id f12so13387109eja.9 for ; Sun, 05 Jul 2020 06:06:14 -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:in-reply-to:references; bh=5twOGYuNwC/3GMZrOWfV4DIXelCgydFq4Z8yu8V+KFw=; b=VArVBhwBIsdMBsuNsYeJL9QlmmTU6LzfmA0SLQDkXn2MaAHetBxgQouaY67WWHpx0W QhrwFgsq7/pghOFQ6zFLN3MSUa1GtK7MO9GS3JHwxte5i9Uhft2u3BfHYWqSftghV/tZ Ks2w+ln9u9/gZ8YCUWs3M95iy1k2DjMKVsomFpaT1aV+e7lRa6Hs0d9QDEV6O8igqrQ8 Moz6N3MsFr0EzWTe8LqoKQYQXJkKk3Tnuv5QCDkpPvZ7RThIZZABxSku95de+VYfm0Of OjRR3OLE8r3nxC/SuyDZ7pgfhVduX1ulYYdhU4zXkQFTLJyWF7JSoPZAx7Ps446DcKwE 0BHw== 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:in-reply-to :references; bh=5twOGYuNwC/3GMZrOWfV4DIXelCgydFq4Z8yu8V+KFw=; b=gH/Kbb9sAUkKwTNtEpLWMk4hylPPspx8quKPvIvyGh7f0kFkmxQJXlB4JAiuiU0fTp y3aVwGokigFOnCZ+bs38z6CHUhcURaLm2RTfvCOt5D2PDSsSu8DOpAB+oNrT7hXT9Ekz HDT6dxf8XpYjCoN9m5ZJ5gl6n/Ah8yjBdDgneh9S8fC/DWLrwaxRO9HmbMAcp6CuSBba l4AVOXtdAJi3wXv731B26HjTY2qKUfmVVP/Q3Fd+fLKFQVgw5CKGyMoKD32V4/7R4qPZ qsgBGJ3PrkxQSB0tmKoOwqDjh2w975Zj+vF2cVwYzbbwKwpWJbhlXsmg9StC/Y7zsa3j WRbw== X-Gm-Message-State: AOAM533e9vtCdpgmNN3I+3qOVmZcO6N6JILOAiRlFxha3j5KWcnRKM0G +7mWbaVsDLxHEEQ+4X+CSlwwcH0NIyQ= X-Google-Smtp-Source: ABdhPJyrjQK2bQ2/KA0d4EW4ZpYVTZkbUF7XmYBifuKPKSZw88IHTH56CxfjuPDb3uBErESHZI/LbA== X-Received: by 2002:a17:906:57c5:: with SMTP id u5mr23766525ejr.311.1593954373742; Sun, 05 Jul 2020 06:06:13 -0700 (PDT) Received: from wasteland.vu.local ([145.108.189.179]) by smtp.gmail.com with ESMTPSA id j5sm21339304edk.53.2020.07.05.06.06.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 05 Jul 2020 06:06:13 -0700 (PDT) From: Manolis Stamatogiannakis To: ffmpeg-devel@ffmpeg.org Date: Sun, 5 Jul 2020 15:05:35 +0200 Message-Id: <20200705130535.5615-3-mstamat@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200705130535.5615-1-mstamat@gmail.com> References: <20200704194543.1738-1-mstamat@gmail.com> <20200705130535.5615-1-mstamat@gmail.com> Subject: [FFmpeg-devel] [PATCH 3/3] avfilter/vf_subtitles: Reorganized subtitles filter options. 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: Manolis Stamatogiannakis MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" 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 | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/doc/filters.texi b/doc/filters.texi index c962ac55b0..c4ca39cb6d 100644 --- a/doc/filters.texi +++ b/doc/filters.texi @@ -6453,6 +6453,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 @@ -17929,15 +17930,12 @@ 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 Set the filename of the subtitle file to read. It must be specified. -@item shift -Shift subtitles timings by the specified amount. - @item original_size Specify the size of the original video, the video for which the ASS file was composed. For the syntax of this option, check the @@ -17952,12 +17950,18 @@ These fonts will be used in addition to whatever the font provider uses. @item alpha Process alpha channel, by default alpha channel is untouched. +@item shift +Shift subtitles timings by the specified amount. +@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