diff options
author | Martin Herkt <lachs0r@srsfckn.biz> | 2016-10-19 19:09:00 +0200 |
---|---|---|
committer | Martin Herkt <lachs0r@srsfckn.biz> | 2016-10-19 19:09:00 +0200 |
commit | 5d74fa7dc0fa1617d1d11b69769423b1387ec785 (patch) | |
tree | 882752015b3500c91b8ab3a4d669696f23feb817 /DOCS/mplayer-changes.rst | |
parent | c226bc7616ab2ae9de6172660e9cf727f07dc374 (diff) | |
parent | a2fa0d0b68ce200598122145254f56ae1adff91e (diff) | |
download | mpv-5d74fa7dc0fa1617d1d11b69769423b1387ec785.tar.bz2 mpv-5d74fa7dc0fa1617d1d11b69769423b1387ec785.tar.xz |
Merge branch 'master' into release/current
Diffstat (limited to 'DOCS/mplayer-changes.rst')
-rw-r--r-- | DOCS/mplayer-changes.rst | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/DOCS/mplayer-changes.rst b/DOCS/mplayer-changes.rst index 0eb523660d..397bb47c9e 100644 --- a/DOCS/mplayer-changes.rst +++ b/DOCS/mplayer-changes.rst @@ -7,8 +7,8 @@ large part of which is incompatible or completely changes how the player behaves. Although there are still many similarities to its ancestors, **mpv** should generally be treated as a completely different program. -.. note:: - These lists are incomplete. +.. admonition:: Warning + This document is not updated anymore, and is incomplete and outdated. General Changes from MPlayer to mpv ----------------------------------- @@ -262,13 +262,14 @@ Command Line Switches ``-ssf <sub>`` ``--sws-...`` ``-stop-xscreensaver`` ``--stop-screensaver`` ``-sub-fuzziness`` ``--sub-auto`` + ``-sub-text-*`` ``--sub-*`` ``-sub`` ``--sub-file`` ``-subcp`` ``--sub-codepage`` ``-subdelay`` ``--sub-delay`` ``-subfile`` ``--sub-file`` - ``-subfont-*`` ``--sub-text-*``, ``--osd-*`` + ``-subfont-*`` ``--sub-*``, ``--osd-*`` ``-subfont-text-scale`` ``--sub-scale`` - ``-subfont`` ``--sub-text-font`` + ``-subfont`` ``--sub-font`` ``-subfps`` ``--sub-fps`` ``-subpos`` ``--sub-pos`` ``-sws`` ``--sws-scaler`` |