From c6fbf91a89db31081e740e77bf7c965147d4dc06 Mon Sep 17 00:00:00 2001 From: wm4 Date: Tue, 11 Dec 2012 01:04:13 +0100 Subject: manpage: mark HTTP related options as deprecated/broken Commit c02f25 switched the "http://" protocol to use ffmpeg's HTTP implementation (stream_lavf.c), instead of the mplayer internal one (http.c). Unfortunately, it turns out that there are some network related options that are not respected by stream_lavf.c, and consequently do not work anymore for "http://" URLs. This might be fixed later. Mark them as deprecated for now, as it might take arbitrarily long until this is taken care of. --- DOCS/man/en/mpv.rst | 2 +- DOCS/man/en/options.rst | 20 ++++++++++++++++++++ 2 files changed, 21 insertions(+), 1 deletion(-) (limited to 'DOCS/man') diff --git a/DOCS/man/en/mpv.rst b/DOCS/man/en/mpv.rst index 7398ed8f43..73d8b0a06b 100644 --- a/DOCS/man/en/mpv.rst +++ b/DOCS/man/en/mpv.rst @@ -28,7 +28,7 @@ Synopsis | **mpv** \dvb://[card\_number@]channel [options] | **mpv** \mf://[filemask|\@listfile] [-mf options] [options] | **mpv** [cdda|cddb]://track[-endtrack][:speed][/device] [options] -| **mpv** [file|mms[t]|http|http\_proxy|rt[s]p|ftp|udp|unsv|icyx|noicyx|smb]:// [user:pass\@]URL[:port] [options] +| **mpv** [file|mms[t]|http|httpproxy|rt[s]p|ftp|udp|unsv|icyx|noicyx|smb]:// [user:pass\@]URL[:port] [options] DESCRIPTION diff --git a/DOCS/man/en/options.rst b/DOCS/man/en/options.rst index 1d8798f260..0aa1098925 100644 --- a/DOCS/man/en/options.rst +++ b/DOCS/man/en/options.rst @@ -451,11 +451,15 @@ (network only) Support cookies when making HTTP requests. Disabled by default. + *WARNING*: works with the deprecated ``mp_http://`` protocol only. + --cookies-file= (network only) Read HTTP cookies from . The file is assumed to be in Netscape format. + *WARNING*: works with the deprecated ``mp_http://`` protocol only. + --correct-pts, --no-correct-pts Switches mpv to a mode where timestamps for video frames are calculated differently and video filters which add new frames or modify @@ -755,6 +759,8 @@ --http-header-fields= Set custom HTTP fields when accessing HTTP stream. + *WARNING*: works with the deprecated ``mp_http://`` protocol only. + *EXAMPLE*: ``mpv --http-header-fields='Field1: value1','Field2: value2' http://localhost:1234`` @@ -863,6 +869,8 @@ Skip any HTTP proxy for IPv6 addresses. It will still be used for IPv4 connections. + *WARNING*: works with the deprecated ``mp_http://`` protocol only. + --joystick, --no-joystick Enable/disable joystick support. Enabled by default. @@ -1351,6 +1359,8 @@ Used with some network protocols. Specify password for HTTP authentication. See also ``--user``. + *WARNING*: works with the deprecated ``mp_http://`` protocol only. + --playing-msg= Print out a string before starting playback. The string is expanded for properties, e.g. ``--playing-msg=file: \${filename}`` will print the string @@ -1407,9 +1417,13 @@ --prefer-ipv4 Use IPv4 on network connections. Falls back on IPv6 automatically. + *WARNING*: works with the deprecated ``mp_http://`` protocol only. + --prefer-ipv6 Use IPv6 on network connections. Falls back on IPv4 automatically. + *WARNING*: works with the deprecated ``mp_http://`` protocol only. + --priority= (Windows only.) Set process priority for mpv according to the predefined priorities @@ -1594,6 +1608,8 @@ --referrer= Specify a referrer path or URL for HTTP requests. + *WARNING*: works with the deprecated ``mp_http://`` protocol only. + --reuse-socket (udp:// only) Allows a socket to be reused by other processes as soon as it is closed. @@ -2183,9 +2199,13 @@ Used with some network protocols. Specify username for HTTP authentication. See also ``--passwd``. + *WARNING*: works with the deprecated ``mp_http://`` protocol only. + --user-agent= Use as user agent for HTTP streaming. + *WARNING*: works with the deprecated ``mp_http://`` protocol only. + -v Increment verbosity level, one level for each ``-v`` found on the command line. -- cgit v1.2.3