summaryrefslogtreecommitdiffstats
path: root/DOCS
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2018-05-22 18:59:59 +0200
committerwm4 <wm4@nowhere>2018-05-24 19:56:35 +0200
commitb2e24f42d557536305c4f8624e1d568d9c26b6af (patch)
treec104b01abb15846b972dfc835097a5bc90ae158a /DOCS
parent115aaec76c7b87aa3564eb7cd98326594b040341 (diff)
downloadmpv-b2e24f42d557536305c4f8624e1d568d9c26b6af.tar.bz2
mpv-b2e24f42d557536305c4f8624e1d568d9c26b6af.tar.xz
options: add --http-proxy
Often requested, trivial.
Diffstat (limited to 'DOCS')
-rw-r--r--DOCS/man/options.rst7
1 files changed, 7 insertions, 0 deletions
diff --git a/DOCS/man/options.rst b/DOCS/man/options.rst
index d56b52b87b..89d9c56eec 100644
--- a/DOCS/man/options.rst
+++ b/DOCS/man/options.rst
@@ -4006,6 +4006,13 @@ Network
Field2: value2
Connection: close
+``--http-proxy=<proxy>``
+ URL of the HTTP/HTTPS proxy. If this is set, the ``http_proxy`` environment
+ is ignored. The ``no_proxy`` environment variable is still respected. This
+ option is silently ignored if it does not start with ``http://``. Proxies
+ are not used for https URLs. Setting this option does not try to make the
+ ytdl script use the proxy.
+
``--tls-ca-file=<filename>``
Certificate authority database file for use with TLS. (Silently fails with
older FFmpeg or Libav versions.)