summaryrefslogtreecommitdiffstats
path: root/DOCS/man/options.rst
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2018-05-22 18:59:59 +0200
committerJan Ekström <jeebjp@gmail.com>2018-05-31 01:24:51 +0300
commitca97239cb6f3ff08d1e9be384352e2a9bd8694e1 (patch)
tree24eeb11f97892901b3a8da3e497f8528defd2d34 /DOCS/man/options.rst
parent935846fc40abdffe53366baf3a81cfb0e0fccd95 (diff)
downloadmpv-ca97239cb6f3ff08d1e9be384352e2a9bd8694e1.tar.bz2
mpv-ca97239cb6f3ff08d1e9be384352e2a9bd8694e1.tar.xz
options: add --http-proxy
Often requested, trivial.
Diffstat (limited to 'DOCS/man/options.rst')
-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 4c4954a99d..b10c2a2b23 100644
--- a/DOCS/man/options.rst
+++ b/DOCS/man/options.rst
@@ -3993,6 +3993,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.)