From c3f8c9a58e3028777466ce0d3f56374efb10f968 Mon Sep 17 00:00:00 2001 From: wm4 Date: Wed, 12 Dec 2012 23:35:01 +0100 Subject: options: move -ass-bottom-margin/-ass-top-margin options to vf_sub These options might be useful sometimes, but they are not that important, and work with vf_sub only. Make them vf_sub sub-options. --- DOCS/man/en/changes.rst | 1 + DOCS/man/en/options.rst | 8 -------- DOCS/man/en/vf.rst | 10 +++++++++- 3 files changed, 10 insertions(+), 9 deletions(-) (limited to 'DOCS/man') diff --git a/DOCS/man/en/changes.rst b/DOCS/man/en/changes.rst index 82066cb75c..b82bef5167 100644 --- a/DOCS/man/en/changes.rst +++ b/DOCS/man/en/changes.rst @@ -113,6 +113,7 @@ Command line switches -subfont-text-scale --sub-scale -spugauss --sub-gauss -vobsub --sub (pass the .idx file) + -ass-bottom-margin --vf=sub=bottom:top =================================== =================================== input.conf and slave commands diff --git a/DOCS/man/en/options.rst b/DOCS/man/en/options.rst index 0aa1098925..51ecab6166 100644 --- a/DOCS/man/en/options.rst +++ b/DOCS/man/en/options.rst @@ -118,10 +118,6 @@ text subtitles only, because ASS subtitles include their own styling information. ---ass-bottom-margin= - Adds a black band at the bottom of the frame. The SSA/ASS renderer can - place subtitles there (with ``--ass-use-margins``). - --ass-force-style=<[Style.]Param=Value[,...]> Override some style or script info parameters. @@ -156,10 +152,6 @@ (Default.) :no: Render subtitles as forced by subtitle scripts. ---ass-top-margin= - Adds a black band at the top of the frame. The SSA/ASS renderer can place - toptitles there (with ``--ass-use-margins``). - --ass-use-margins Enables placing toptitles and subtitles in black borders when they are available. diff --git a/DOCS/man/en/vf.rst b/DOCS/man/en/vf.rst index 13d782c0f4..439701754a 100644 --- a/DOCS/man/en/vf.rst +++ b/DOCS/man/en/vf.rst @@ -661,11 +661,19 @@ screenshot screenshot_force Same as ``screenshot``, but prefer it over VO based screenshot code. -sub +sub=[=bottom-margin:top-margin] Moves subtitle rendering to an arbitrary point in the filter chain, or force subtitle rendering in the video filter as opposed to using video output OSD support. + + + Adds a black band at the bottom of the frame. The SSA/ASS renderer can + place subtitles there (with ``--ass-use-margins``). + + Black band on the top for toptitles (with ``--ass-use-margins``). + + *EXAMPLE*: ``--vf=sub,eq`` -- cgit v1.2.3