From 5bf8706d1f6536cd89207b777161ab83195ddb20 Mon Sep 17 00:00:00 2001 From: wm4 Date: Sat, 8 Dec 2012 13:59:49 +0100 Subject: sub: remove vobsub reader in favor of ffmpeg vobsub demuxer ffmpeg recently added a demuxer that can read vobsubs (pairs of .sub and .idx files). Get rid of the internal vobsub reader, and use the ffmpeg demuxer instead. Sneak in an unrelated manpage change (autosub default). --- DOCS/man/en/changes.rst | 1 + DOCS/man/en/options.rst | 19 ++++++------------- 2 files changed, 7 insertions(+), 13 deletions(-) (limited to 'DOCS') diff --git a/DOCS/man/en/changes.rst b/DOCS/man/en/changes.rst index c2cceddcfc..82066cb75c 100644 --- a/DOCS/man/en/changes.rst +++ b/DOCS/man/en/changes.rst @@ -112,6 +112,7 @@ Command line switches -sub-fuzziness --autosub-match -subfont-text-scale --sub-scale -spugauss --sub-gauss + -vobsub --sub (pass the .idx file) =================================== =================================== input.conf and slave commands diff --git a/DOCS/man/en/options.rst b/DOCS/man/en/options.rst index 1e24d2b071..4f2acc5793 100644 --- a/DOCS/man/en/options.rst +++ b/DOCS/man/en/options.rst @@ -205,6 +205,8 @@ :fuzzy: Load all subs containing movie name. :all: Load all subs in the current and ``--sub-paths`` directories. + (Default: exact.) + --autosync= Gradually adjusts the A/V sync based on audio delay measurements. Specifying ``--autosync=0``, the default, will cause frame timing to be @@ -779,10 +781,6 @@ *NOTE*: This option only works if the underlying media supports seeking (i.e. not with stdin, pipe, etc). ---ifo= - Indicate the VOBsub IFO file that will be used to load palette and frame - size for VOBsub subtitles. - --ignore-start Matters with the builtin AVI demuxer only, which is not enabled by default. Ignore the specified starting time for streams in AVI files. This @@ -1692,7 +1690,7 @@ --sid= Display the subtitle stream specified by (0-31). ``auto`` selects the default, ``no`` disables subtitles. - See also ``--slang``, ``--vobsubid``, ``--no-sub``. + See also ``--slang``, ``--no-sub``. --slang= Specify a priority list of subtitle languages to use. Different container @@ -1883,7 +1881,9 @@ Open the given file with a demuxer, and use its subtitle streams. Same as ``--audiofile``, but for subtitle streams. - Use ``--sub`` for normal text subtitle files. + *NOTE*: use ``--sub`` for subtitle files. This option is useless, unless + you want to force libavformat subtitle parsers instead of libass or + internal subtitle parsers. --subfps= Specify the framerate of the subtitle file (default: movie fps). @@ -2210,13 +2210,6 @@ configuration files specifying a list of fallbacks may make sense. See `video_outputs` for details and descriptions of available drivers. ---vobsub= - Specify a VOBsub file to use for subtitles. Has to be the full pathname - without extension, i.e. without the ``.idx``, ``.ifo`` or ``.sub``. - ---vobsubid=<0-31> - Specify the VOBsub subtitle ID. - --volstep=<0-100> Set the step size of mixer volume changes in percent of the whole range (default: 3). -- cgit v1.2.3