diff options
| author | wm4 <wm4@nowhere> | 2013-07-14 17:59:26 +0200 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2013-07-14 17:59:26 +0200 |
| commit | e18ffd6b998858ca0797cb0ce4aabd4a509655dd (patch) | |
| tree | 199bddd30923db1175a1331191eb86ba684e9e41 /DOCS/man/en/changes.rst | |
| parent | 3e7d483ac89289f613138002be2043ec5f479bb0 (diff) | |
| parent | 5ead20bdb3328d199dad693039d18e7a05eb2465 (diff) | |
| download | mpv-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/en/changes.rst')
| -rw-r--r-- | DOCS/man/en/changes.rst | 1 |
1 files changed, 0 insertions, 1 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`` |