From patchwork Sun Jul 5 18:22:47 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Manolis Stamatogiannakis X-Patchwork-Id: 20828 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 B8BF9443816 for ; Sun, 5 Jul 2020 21:23:07 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 87E78689E5C; Sun, 5 Jul 2020 21:23:07 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ed1-f65.google.com (mail-ed1-f65.google.com [209.85.208.65]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 4E3D468024C for ; Sun, 5 Jul 2020 21:23:01 +0300 (EEST) Received: by mail-ed1-f65.google.com with SMTP id e15so32695403edr.2 for ; Sun, 05 Jul 2020 11:23:01 -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=k459Up+0HZpWYcEaJ0CCihyKLs8y1nQHiN2vzt4UZvI=; b=ScmVmnaSc2MHwPqgdEUyJOWZbUc94fZuDTr+HQW/rRDAflm5CPKMwRebB7EwRgfhbV nGqq9Yt6EelBE8gYUpicr3/goxKlK4HbMwEl+Lnbn1Rvt4/d/nV5IbG6pTGGqkRElwxQ kwXTOzMqob+Y05dvfUlpFhtdzubJumwyJjJu7vboMBsO382Ld24Yygp3pjnwfrdejRcp 0r74o4ZKDyXtHof44daMmXmgZ4yezccpWRzZI7hi2oDYvtJXrn/jh5otmslP66OfcfA/ fJ/P12ChLg4dWo9Rrf2dUiXRSRyrXxgDQkPwsi7ipW0OGZX3GuflxbI2unZn+TV60b8F vfvw== 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=k459Up+0HZpWYcEaJ0CCihyKLs8y1nQHiN2vzt4UZvI=; b=DQ0lYFNDH0dJ2yYxZc12VBuu+E5VgY+D3xrupHm58ZtCybxyFIJAl09Ymz7QLYwaXD 5smCe2NLFbRes+HiNkZzp1r/4jUSkQqH7W7PgCEeTpYTjah422ZWw43+3osPmVHDiMWW sdUAsdV4kWrhyVZoIUd8fpRwfXot+0JPYi2fa/CIWMtmEvEqQ3urazb9pvA1CEvRDciq oeMc0MB0EAmg75jSWfELU7Xmi86SvqNACBTH81RF1iatDAiSf5o753LWdmMrKHMs+hHz o0klResvHRUMUiPIAk5eWXpYfZjDL+OqKGqGC8DxMTm2Kfzk+eGrblXppupf7p3jkpli CzKQ== X-Gm-Message-State: AOAM533KRARngTObt1y3PIER9y5dxmOMWqgNIyq6VksAwvjFUStbv5nP EYxVaPHa2hTwq8NAlbuHmRMwM8kDIOs= X-Google-Smtp-Source: ABdhPJzM9tYlygKC605b1XyGEOdk2tq4KvedEe9Cvt9vQbT/kkBt66wI+TlDadknaYoTXOjfUVByMA== X-Received: by 2002:a50:9306:: with SMTP id m6mr51458174eda.216.1593973380449; Sun, 05 Jul 2020 11:23:00 -0700 (PDT) Received: from wasteland.vu.local ([145.108.189.179]) by smtp.gmail.com with ESMTPSA id qc16sm14988712ejb.33.2020.07.05.11.22.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 05 Jul 2020 11:22:59 -0700 (PDT) From: Manolis Stamatogiannakis To: ffmpeg-devel@ffmpeg.org Date: Sun, 5 Jul 2020 20:22:47 +0200 Message-Id: <20200705182248.28438-1-mstamat@gmail.com> X-Mailer: git-send-email 2.17.1 Subject: [FFmpeg-devel] [PATCH 1/2] 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 | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/doc/filters.texi b/doc/filters.texi index ad2448acb2..d2b8feb14b 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,7 +17930,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 @@ -17948,13 +17949,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