summaryrefslogtreecommitdiffstats
path: root/DOCS/man/en/changes.rst
diff options
context:
space:
mode:
Diffstat (limited to 'DOCS/man/en/changes.rst')
-rw-r--r--DOCS/man/en/changes.rst169
1 files changed, 86 insertions, 83 deletions
diff --git a/DOCS/man/en/changes.rst b/DOCS/man/en/changes.rst
index 494c46e186..eeac7fada9 100644
--- a/DOCS/man/en/changes.rst
+++ b/DOCS/man/en/changes.rst
@@ -1,5 +1,3 @@
-.. _changes:
-
CHANGES FROM OTHER VERSIONS OF MPLAYER
======================================
@@ -8,11 +6,11 @@ MPlayer (also called mplayer, mplayer-svn, mplayer1). Many changes
have been made. Some changes are incompatible, or completely change how the
player behaves.
-General Changes for MPlayer-svn to mplayer2
--------------------------------------------
+General Changes for MPlayer to mplayer2
+---------------------------------------
* Removal of the internal GUI, MEncoder, OSD menu
-* Better pause handling (don't unpause on a command)
+* Better pause handling (do not unpause on a command)
* Better MKV support (such as ordered chapters)
* vo_vdpau improvements
* Precise seeking support
@@ -83,59 +81,61 @@ Command Line Switches
syntax. ``-optname optvalue`` becomes ``--optname=optvalue``.
The old syntax will not be removed in the near future. However, the new
- syntax is mentioned in all documentation and so on, so it's a good thing to
+ syntax is mentioned in all documentation and so on, so it is a good thing to
know about this change.
(The new syntax was introduced in mplayer2.)
* In general, negating switches like ``-noopt`` now have to be written as
``-no-opt``, or better ``--no-opt``.
* Per-file options are not the default anymore. You can explicitly specify
- file local options. See ``Usage`` section.
+ file-local options. See ``Usage`` section.
* Table of renamed/replaced switches:
- =================================== ===================================
- Old New
- =================================== ===================================
- -no<opt> --no-<opt> (add a dash)
- -nosound --no-audio
- -use-filename-title --title="${filename}"
- -loop 0 --loop=inf
- -hardframedrop --framedrop=hard
- -osdlevel --osd-level
- -delay --audio-delay
- -subdelay --sub-delay
- -subpos --sub-pos
- -forcedsubsonly --sub-forced-only
- -benchmark --untimed (no stats)
- -xineramascreen --screen (different values)
- -ss --start
- -endpos --length
- --cursor-autohide-delay --cursor-autohide
- -sub-fuzziness --autosub-match
- -subfont --sub-text-font
- -font --osd-font
- -subfont-* --sub-text-*, --osd-*
- -subfont-text-scale --sub-scale
- -spugauss --sub-gauss
- -vobsub --sub (pass the .idx file)
- -ass-bottom-margin --vf=sub=bottom:top
- -vc ffh264vdpau (etc.) --hwdec=vdpau
- -ac spdifac3 --ad=spdif:ac3 (see --ad=help)
- -afm hwac3 --ad=spdif:ac3,spdif:dts
- -x W, -y H --geometry=WxH + --no-keepaspect
- -xy W --autofit=W
- -a52drc level --ad-lavc-ac3drc=level
- -dumpstream --stream-dump=<filename>
- -capture --stream-capture=<filename>
- -stop-xscreensaver --stop-screensaver
- -subfile --sub
- -lavdopts ... --vd-lavc-...
- -lavfdopts --demuxer-lavf-...
- -rawaudio ... --demuxer-rawaudio-...
- -rawvideo ... --demuxer-rawvideo-...
- =================================== ===================================
-
-*NOTE*: ``-opt val`` becomes ``--opt=val``.
+ =========================== ========================================
+ Old New
+ =========================== ========================================
+ ``-no<opt>`` ``--no-<opt>`` (add a dash)
+ ``-nosound`` ``--no-audio``
+ ``-use-filename-title`` ``--title="${filename}"``
+ ``-loop 0`` ``--loop=inf``
+ ``-hardframedrop`` ``--framedrop=hard``
+ ``-osdlevel`` ``--osd-level``
+ ``-delay`` ``--audio-delay``
+ ``-subdelay`` ``--sub-delay``
+ ``-subpos`` ``--sub-pos``
+ ``-forcedsubsonly`` ``--sub-forced-only``
+ ``-benchmark`` ``--untimed`` (no stats)
+ ``-xineramascreen`` ``--screen`` (different values)
+ ``-ss`` ``--start``
+ ``-endpos`` ``--length``
+ ``--cursor-autohide-delay`` ``--cursor-autohide``
+ ``-sub-fuzziness`` ``--autosub-match``
+ ``-subfont`` ``--sub-text-font``
+ ``-font`` ``--osd-font``
+ ``-subfont-*`` ``--sub-text-*``, ``--osd-*``
+ ``-subfont-text-scale`` ``--sub-scale``
+ ``-spugauss`` ``--sub-gauss``
+ ``-vobsub`` ``--sub`` (pass the .idx file)
+ ``-ass-bottom-margin`` ``--vf=sub=bottom:top``
+ ``-vc ffh264vdpau`` (etc.) ``--hwdec=vdpau``
+ ``-ac spdifac3`` ``--ad=spdif:ac3`` (see ``--ad=help``)
+ ``-afm hwac3`` ``--ad=spdif:ac3,spdif:dts``
+ ``-x W``, ``-y H`` ``--geometry=WxH`` + ``--no-keepaspect``
+ ``-xy W`` ``--autofit=W``
+ ``-a52drc level`` ``--ad-lavc-ac3drc=level``
+ ``-dumpstream`` ``--stream-dump=<filename>``
+ ``-capture`` ``--stream-capture=<filename>``
+ ``-stop-xscreensaver`` ``--stop-screensaver``
+ ``-subfile`` ``--sub``
+ ``-lavdopts ...`` ``--vd-lavc-...``
+ ``-lavfdopts`` ``--demuxer-lavf-...``
+ ``-rawaudio ...`` ``--demuxer-rawaudio-...``
+ ``-rawvideo ...`` ``--demuxer-rawvideo-...``
+ =========================== ========================================
+
+.. note::
+
+ ``-opt val`` becomes ``--opt=val``.
input.conf and Slave Commands
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -152,52 +152,55 @@ input.conf and Slave Commands
+--------------------------------+----------------------------------------+
| Old | New |
+================================+========================================+
- | pt_step 1 [0|1] | playlist_next [weak|force] |
- | | (translation layer can't deal with |
+ | ``pt_step 1 [0|1]`` | ``playlist_next [weak|force]`` |
+ | | (translation layer cannot deal with |
| | whitespace) |
+--------------------------------+----------------------------------------+
- | pt_step -1 [0|1] | playlist_prev [weak|force] (same) |
+ | ``pt_step -1 [0|1]`` | ``playlist_prev [weak|force] (same)`` |
+--------------------------------+----------------------------------------+
- | switch_ratio [<ratio>] | set aspect <ratio> |
- | | set aspect 0 (to reset aspect) |
+ | ``switch_ratio [<ratio>]`` | ``set aspect <ratio>`` |
+ | | |
+ | | ``set aspect 0`` (to reset aspect) |
+--------------------------------+----------------------------------------+
- | step_property_osd <prop> <step>| cycle <prop> <step> (wraps), |
- | <dir> | add <prop> <step> (clamps). |
- | | <dir> parameter unsupported. Use |
- | | a negative step instead. |
+ | ``step_property_osd <prop>`` | ``cycle <prop> <step>`` (wraps), |
+ | ``<step> <dir>`` | ``add <prop> <step>`` (clamps). |
+ | | ``<dir>`` parameter unsupported. Use |
+ | | a negative ``<step>`` instead. |
+--------------------------------+----------------------------------------+
- | step_property <prop> <step> | Prefix cycle or add with no-osd: |
- | <dir> | no-osd cycle <prop> <step> |
+ | ``step_property <prop>`` | Prefix ``cycle`` or ``add`` with |
+ | ``<step> <dir>`` | ``no-osd``: ``no-osd cycle <prop>`` |
+ | | ``<step>`` |
+--------------------------------+----------------------------------------+
- | osd_show_property_text <text> | show_text <text> |
- | | The property expansion format string |
+ | ``osd_show_property_text`` | ``show_text <text>`` |
+ | ``<text>`` | The property expansion format string |
| | syntax slightly changed. |
+--------------------------------+----------------------------------------+
- | osd_show_text | Now does the same as |
- | | osd_show_property_text. Use the raw |
- | | prefix to disable property expansion. |
+ | ``osd_show_text`` | Now does the same as |
+ | | ``osd_show_property_text``. Use the |
+ | | ``raw`` prefix to disable property |
+ | | expansion. |
+--------------------------------+----------------------------------------+
- | show_tracks | show_text ${track-list} |
+ | ``show_tracks`` | ``show_text ${track-list}`` |
+--------------------------------+----------------------------------------+
- | show_chapters | show_text ${chapter-list} |
+ | ``show_chapters`` | ``show_text ${chapter-list}`` |
+--------------------------------+----------------------------------------+
Other
~~~~~
* The playtree has been removed. **mpv**'s internal playlist is a simple and
- flat list now. This makes the code easier, and makes **mpv** usage less
+ flat list now. This simplifies the code and makes **mpv** usage less
confusing.
* Slave mode is broken. This mode is entirely insane in the ``old`` versions of
- mplayer. A proper slave mode application needed tons of code and hacks to get
+ MPlayer. A proper slave mode application needed tons of code and hacks to get
it right. The main problem is that slave mode is a bad and incomplete
interface, and to get around that, applications parsed output messages
- intended for users. It's hard to know which messages exactly are parsed by
+ intended for users. It is hard to know which messages exactly are parsed by
slave mode applications. This makes it virtually impossible to improve
terminal output intended for users without possibly breaking something.
This is absolutely insane, and **mpv** will not try to keep slave mode
- compatible. If you're a developer of a slave mode application, contact us,
+ compatible. If you are a developer of a slave mode application, contact us,
and a new and better protocol can be developed.
Policy for Removed Features
@@ -209,22 +212,22 @@ likely to be not used by many, and causes problems otherwise, it will be
removed. Developers should not be burdened with fixing or cleaning up code that
has no actual use.
-It's always possible to add back removed features. File a feature request if a
-feature you relied on was removed, and you want it back. Though it might be
-rejected in the worst case, it's much more likely that it will be either added
+It is always possible to add back removed features. File a feature request if a
+feature you relied on has been removed, and you want it back. Though it might be
+rejected in the worst case, it is much more likely that it will be either added
back, or that a better solution will be implemented.
Why this Fork?
--------------
-* mplayer-svn wants to maintain old code, even if it's very bad code. It seems
- mplayer2 was forked, because mplayer-svn developers refused to get rid of
- all the cruft. The mplayer2 and mplayer-svn codebases also deviated enough to
- make a reunification unlikely.
-* mplayer2 development is slow, and it's hard to get in changes. Details
+* MPlayer wants to maintain old code, even if it is very bad code. It seems
+ mplayer2 was forked because MPlayer developers refused to get rid of all the
+ cruft. The mplayer2 and MPlayer codebases also deviated enough to make a
+ reunification unlikely.
+* mplayer2 development is slow, and it is hard to get in changes. Details
withheld as to not turn this into a rant.
-* mplayer-svn rarely merged from mplayer2, and mplayer2 practically stopped
- merging from mplayer-svn (not even code cleanups or new features are merged)
-* **mpv** intents to continuously merge from mplayer-svn and mplayer2, while
+* MPlayer rarely merged from mplayer2, and mplayer2 practically stopped
+ merging from MPlayer (not even code cleanups or new features are merged)
+* **mpv** intends to continuously merge from mplayer-svn and mplayer2, while
speeding up development. There is willingness for significant changes, even
if this means breaking compatibility.