summaryrefslogtreecommitdiffstats
path: root/DOCS/man
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2013-07-14 17:59:26 +0200
committerwm4 <wm4@nowhere>2013-07-14 17:59:26 +0200
commite18ffd6b998858ca0797cb0ce4aabd4a509655dd (patch)
tree199bddd30923db1175a1331191eb86ba684e9e41 /DOCS/man
parent3e7d483ac89289f613138002be2043ec5f479bb0 (diff)
parent5ead20bdb3328d199dad693039d18e7a05eb2465 (diff)
downloadmpv-e18ffd6b998858ca0797cb0ce4aabd4a509655dd.tar.bz2
mpv-e18ffd6b998858ca0797cb0ce4aabd4a509655dd.tar.xz
Merge branch 'remove_old_demuxers'
The merged branch doesn't actually just remove old demuxers, but also includes a branch of cleanups and some refactoring. Conflicts: stream/stream.c
Diffstat (limited to 'DOCS/man')
-rw-r--r--DOCS/man/en/changes.rst1
-rw-r--r--DOCS/man/en/options.rst21
2 files changed, 0 insertions, 22 deletions
diff --git a/DOCS/man/en/changes.rst b/DOCS/man/en/changes.rst
index 70f6fd71ec..eeac7fada9 100644
--- a/DOCS/man/en/changes.rst
+++ b/DOCS/man/en/changes.rst
@@ -104,7 +104,6 @@ Command Line Switches
``-subdelay`` ``--sub-delay``
``-subpos`` ``--sub-pos``
``-forcedsubsonly`` ``--sub-forced-only``
- ``-ni`` ``--avi-ni``
``-benchmark`` ``--untimed`` (no stats)
``-xineramascreen`` ``--screen`` (different values)
``-ss`` ``--start``
diff --git a/DOCS/man/en/options.rst b/DOCS/man/en/options.rst
index 150c12d043..58fc365db1 100644
--- a/DOCS/man/en/options.rst
+++ b/DOCS/man/en/options.rst
@@ -695,12 +695,6 @@
Stop at given absolute time. Use ``--length`` if the time should be relative
to ``--start``. See ``--start`` for valid option values and examples.
-``--no-extbased``, ``--extbased``
- ``--no-extbased`` disables extension-based demuxer selection. By default,
- when the file type (demuxer) cannot be detected reliably (the file has no
- header or it is not reliable enough), the filename extension is used to
- select the demuxer. Always falls back on content-based demuxer selection.
-
``--field-dominance=<auto|top|bottom>``
Set first field for interlaced content. Useful for deinterlacers that
double the framerate: ``--vf=yadif=1`` and ``--vo=vdpau:deint``.
@@ -1049,11 +1043,6 @@
This option only works if the underlying media supports seeking
(i.e. not with stdin, pipe, etc).
-``--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
- nullifies stream delays.
-
``--include=<configuration-file>``
Specify configuration file to be parsed after the default ones.
@@ -1258,20 +1247,10 @@
depends on the VO backend and how it handles keyboard input. Does not
apply to terminal input.)
-``--avi-ni``
- (Internal AVI demuxer which is not used by default only)
- Force usage of non-interleaved AVI parser (fixes playback of some bad AVI
- files).
-
``--no-aspect``
Ignore aspect ratio information from video file and assume the video has
square pixels. See also ``--aspect``.
-``--no-bps``
- (Internal AVI demuxer which is not used by default only)
- Do not use average byte/second value for A-V sync. Helps with some AVI
- files with broken header.
-
``--no-cache``
Turn off input stream caching. See ``--cache``.