diff options
100 files changed, 2906 insertions, 2280 deletions
diff --git a/DOCS/crosscompile-mingw.txt b/DOCS/crosscompile-mingw.txt index 0a739a945e..968da6a435 100644 --- a/DOCS/crosscompile-mingw.txt +++ b/DOCS/crosscompile-mingw.txt @@ -11,7 +11,7 @@ Currently, using an experimental branch of MXE is required: Warning: the original MinGW (http://www.mingw.org) is unsupported. -Note that MingGW environments included in Linux distributions are often broken, +Note that MinGW environments included in Linux distributions are often broken, outdated and useless, and usually don't use MinGW-w64. Example with MXE @@ -25,7 +25,7 @@ cd /opt git clone https://github.com/tonytheodore/mxe.git mingw cd mingw -# Edit the MXE target, so that MingGW-w64 for 32 bit targets is built. +# Edit the MXE target, so that MinGW-w64 for 32 bit targets is built. echo "MXE_TARGETS := i686-w64-mingw32" > settings.mk @@ -38,7 +38,7 @@ make libass make jpeg make pthreads -# MXE and MingGW-w64 don't provide up-to-date OpenGL headers (to my knowledge). +# Older MXE and MinGW-w64 snapshots don't provide up-to-date OpenGL headers. wget http://www.opengl.org/registry/api/glext.h mv glext.h usr/i686-w64-mingw32/include/GL/ diff --git a/DOCS/man/en/changes.rst b/DOCS/man/en/changes.rst index 5ff532ddc9..6705846fd5 100644 --- a/DOCS/man/en/changes.rst +++ b/DOCS/man/en/changes.rst @@ -65,6 +65,7 @@ General Changes for mplayer2 to mpv ``mpv input.mkv -o output.y4m --no-audio --oautofps --oneverdrop``. * Image subtitles (DVDs etc.) are rendered in color and use more correct positioning (color can be disabled with ``--sub-gray``) +* Wayland support * General code cleanups * Many more changes diff --git a/DOCS/man/en/input.rst b/DOCS/man/en/input.rst index 9a7c9fc4a1..ae887a2080 100644 --- a/DOCS/man/en/input.rst +++ b/DOCS/man/en/input.rst @@ -289,6 +289,11 @@ Input Commands that are Possibly Subject to Change refer to filters by name in all of the filter chain modification commands. For ``add``, using an already used label will replace the existing filter. + The ``vf`` command shows the list of requested filters on the OSD after + changing the filter chain. This is roughly equivalent to + ``show_text ${vf}``. Note that auto-inserted filters for format conversion + are not shown on the list, only what was requested by the user. + .. admonition:: Example for input.conf - ``a vf set flip`` turn video upside-down on the ``a`` key @@ -469,6 +474,8 @@ Name W Comment ``track-list`` list of audio/video/sub tracks, cur. entr. marked ``chapter-list`` list of chapters, current entry marked ``quvi-format`` x see ``--quvi-format`` +``af`` x see ``--af`` +``vf`` x see ``--vf`` ``options/name`` read-only access to value of option ``--name`` =============================== = ================================================== diff --git a/DOCS/man/en/mpv.rst b/DOCS/man/en/mpv.rst index 781687df0d..af905539f0 100644 --- a/DOCS/man/en/mpv.rst +++ b/DOCS/man/en/mpv.rst @@ -27,7 +27,7 @@ SYNOPSIS | **mpv** [options] {group of files and options} | **mpv** [bd]://[title][/device] [options] | **mpv** dvd://[title|[start\_title]-end\_title][/device] [options] -| **mpv** \vcd://track[/device] +| **mpv** \vcd://[/device] | **mpv** \tv://[channel][/input_id] [options] | **mpv** radio://[channel|frequency][/capture] [options] | **mpv** \pvr:// [options] @@ -424,23 +424,6 @@ profile name ``default`` to continue with normal options. device=spdif -OPTIONS -======= - -.. include:: options.rst - -.. include:: ao.rst - -.. include:: vo.rst - -.. include:: af.rst - -.. include:: vf.rst - -.. include:: encode.rst - -.. include:: input.rst - TAKING SCREENSHOTS ================== @@ -459,6 +442,23 @@ taking screenshots is handled by the VOs, and adding the screenshot filter will break hardware decoding. (The filter may still be useful for taking screenshots at a certain point within the video chain when using multiple video filters.) +OPTIONS +======= + +.. include:: options.rst + +.. include:: ao.rst + +.. include:: vo.rst + +.. include:: af.rst + +.. include:: vf.rst + +.. include:: encode.rst + +.. include:: input.rst + .. include:: changes.rst ENVIRONMENT VARIABLES @@ -467,8 +467,15 @@ ENVIRONMENT VARIABLES There are a number of environment variables that can be used to control the behavior of mpv. +``HOME`` + Used to determine mpv config directory: ``$HOME/.mpv`` + +``TERM`` + Used to determine terminal type. + ``MPV_HOME`` - Directory where mpv looks for user settings. + Directory where mpv looks for user settings. Overrides ``HOME``, and mpv + will try to load the config file as ``$MPV_HOME/config``. ``MPV_LOCALEDIR`` Directory where mpv looks for gettext translation files (if enabled). @@ -478,12 +485,30 @@ behavior of mpv. The resulting verbosity corresponds to that of ``--msglevel=5`` plus the value of ``MPV_VERBOSE``. -libaf: - ``LADSPA_PATH`` - Specifies the search path for LADSPA plugins. If it is unset, fully - qualified path names must be used. +``MPV_LEAK_REPORT`` + If set to ``1``, enable internal talloc leak reporting. Note that this can + cause trouble with multithreading, so only developers should use this. + +``LADSPA_PATH`` + Specifies the search path for LADSPA plugins. If it is unset, fully + qualified path names must be used. - FIXME: This is also mentioned in the ladspa section. +``DISPLAY`` + Standard X11 display name to use. + +FFmpeg/Libav: + This library accesses various environment variables. However, they are not + centrally documented, and documenting them is not our job. Therefore, the + list is incomplete. + + Notable environment variables: + + ``http_proxy`` + URL to proxy for ``http://`` and ``https://`` URLs. + + ``no_proxy`` + List of domain patterns for which no proxy should be used. + List entries are separated by ``,``. Patterns can include ``*``. libdvdcss: ``DVDCSS_CACHE`` @@ -540,60 +565,31 @@ libdvdcss: ``HOME`` FIXME: Document this. -osdep: - ``TERM`` - FIXME: Document this. -libvo: - ``DISPLAY`` - FIXME: Document this. +EXIT CODES +========== - ``HOME`` - FIXME: Document this. - -libmpdemux: - - ``HOME`` - FIXME: Document this. - - ``HOMEPATH`` - FIXME: Document this. - - ``http_proxy`` - FIXME: Document this. +Normally **mpv** returns 0 as exit code after finishing playback successfully. +If errors happen, the following exit codes can be returned: - ``LOGNAME`` - FIXME: Document this. - - ``USERPROFILE`` - FIXME: Document this. - -libavformat: - - ``AUDIO_FLIP_LEFT`` - FIXME: Document this. - - ``BKTR_DEV`` - FIXME: Document this. - - ``BKTR_FORMAT`` - FIXME: Document this. - - ``BKTR_FREQUENCY`` - FIXME: Document this. - - ``http_proxy`` - FIXME: Document this. - - ``no_proxy`` - FIXME: Document this. + :1: Error initializing mpv. This is also returned if unknown options are + passed to mpv. + :2: The file passed to mpv couldn't be played. This is somewhat fuzzy: + currently, playback of a file is considered to be successful if + initialization was mostly successful, even if playback fails + immediately after initialization. |