From cfa45c40dc0cfe44b699029168b62d4d3e16c288 Mon Sep 17 00:00:00 2001 From: wm4 Date: Sat, 22 Jun 2013 02:09:52 +0200 Subject: 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. --- DOCS/man/en/changes.rst | 1 + DOCS/man/en/options.rst | 11 +---------- 2 files changed, 2 insertions(+), 10 deletions(-) (limited to 'DOCS') 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= -capture --stream-capture= -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. --sub-demuxer=<[+]name> - 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``. --sub-paths= @@ -2046,14 +2045,6 @@ --sub-delay= Delays subtitles by seconds. Can be negative. ---subfile= - 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. - --subfps= Specify the framerate of the subtitle file (default: movie fps). -- cgit v1.2.3