path: root/DOCS
diff options
authorwm4 <wm4@nowhere>2013-06-22 02:09:52 +0200
committerwm4 <wm4@nowhere>2013-06-25 00:11:56 +0200
commitcfa45c40dc0cfe44b699029168b62d4d3e16c288 (patch)
tree5a80d3b6e82711a5816c509e803c029b93342892 /DOCS
parent1bfae45a88ac7c24b74a6f7ca6eb4aa27d20c653 (diff)
sub: add demux_libass wrapper, drop old hacks
demux_libass.c allows us to make subtitle format detection part of the normal file loading process. libass has no probe function, but trying to load the start of a file (the first 4 KB) is good enough. Hope that libass can even handle random binary input gracefully without printing stupid log messages, and that the libass parser doesn't accept too many non-ASS files as input. This doesn't handle the -subcp option correctly yet. This will be fixed later.
Diffstat (limited to 'DOCS')
2 files changed, 2 insertions, 10 deletions
diff --git a/DOCS/man/en/changes.rst b/DOCS/man/en/changes.rst
index de3b24b710..ed83c402f3 100644
--- a/DOCS/man/en/changes.rst
+++ b/DOCS/man/en/changes.rst
@@ -128,6 +128,7 @@ Command line switches
-dumpstream --stream-dump=<filename>
-capture --stream-capture=<filename>
-stop-xscreensaver --stop-screensaver
+ -subfile --sub
=================================== ===================================
*NOTE*: ``-opt val`` becomes ``--opt=val``.
diff --git a/DOCS/man/en/options.rst b/DOCS/man/en/options.rst
index b9068b1562..83ceb15c49 100644
--- a/DOCS/man/en/options.rst
+++ b/DOCS/man/en/options.rst
@@ -1998,8 +1998,7 @@
subtitles muxed with audio/video, or subtitles in the ASS format.
- Force subtitle demuxer type for ``--subfile``. Using a '+' before the name
- will force it, this will skip some checks! Give the demuxer name as
+ Force subtitle demuxer type for ``--sub``. Give the demuxer name as
printed by ``--sub-demuxer=help``.
@@ -2046,14 +2045,6 @@
Delays subtitles by <sec> seconds. Can be negative.
- Open the given file with a demuxer, and use its subtitle streams. Same as
- ``--audiofile``, but for subtitle streams.
- *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.
Specify the framerate of the subtitle file (default: movie fps).