summaryrefslogtreecommitdiffstats
path: root/DOCS/man/en/mpv.rst
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2012-12-11 01:04:13 +0100
committerwm4 <wm4@nowhere>2012-12-11 01:04:13 +0100
commitc6fbf91a89db31081e740e77bf7c965147d4dc06 (patch)
tree92f793b44dc9557909780482951761ff5ce50ca4 /DOCS/man/en/mpv.rst
parent3f949cf50b5067f2fa18b1a2bbdfdd62a0d0ffdd (diff)
downloadmpv-c6fbf91a89db31081e740e77bf7c965147d4dc06.tar.bz2
mpv-c6fbf91a89db31081e740e77bf7c965147d4dc06.tar.xz
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.
Diffstat (limited to 'DOCS/man/en/mpv.rst')
-rw-r--r--DOCS/man/en/mpv.rst2
1 files changed, 1 insertions, 1 deletions
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