From 854303ad49d188d96af8151b290162916c81c993 Mon Sep 17 00:00:00 2001
From: wm4 <wm4@nowhere>
Date: Sun, 7 Jul 2013 19:40:14 +0200
Subject: Remove internal network support

This commit removes the "old" networking code in favor of libavformat's
code.

The code was still used for mp_http, udp, ftp, cddb. http has been
mapped to libavformat's http support since approximately 6 months ago.
udp and ftp have support in ffmpeg (though ftp was added only last
month). cddb support is removed with this commit - it's probably not
important and rarely used if at all, so we don't care about it.
---
 DOCS/man/en/options.rst | 28 ----------------------------
 1 file changed, 28 deletions(-)

(limited to 'DOCS/man/en')

diff --git a/DOCS/man/en/options.rst b/DOCS/man/en/options.rst
index 8a5a9baa44..0d83764d80 100644
--- a/DOCS/man/en/options.rst
+++ b/DOCS/man/en/options.rst
@@ -1051,12 +1051,6 @@
     work (key bindings that normally quit will be shown on OSD only, just
     like any other binding).
 
---ipv4-only-proxy
-    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.
 
@@ -1416,12 +1410,6 @@
     allows a zoom factor of up to 4. This feature is experimental. Do not
     report bugs unless you are using ``--vo=opengl``.
 
---passwd=<password>
-    Used with some network protocols. Specify password for HTTP authentication.
-    See also ``--user``.
-
-    *WARNING*: works with the deprecated ``mp_http://`` protocol only.
-
 --playing-msg=<string>
     Print out a string after starting playback. The string is expanded for
     properties, e.g. ``--playing-msg=file: ${filename}`` will print the string
@@ -1466,16 +1454,6 @@
 --pphelp
     See also ``--vf=pp``.
 
---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=<prio>
     (Windows only.)
     Set process priority for mpv according to the predefined priorities
@@ -2284,12 +2262,6 @@
 
     *WARNING*: May be dangerous if playing from untrusted media.
 
---user=<username>
-    Used with some network protocols.
-    Specify username for HTTP authentication. See also ``--passwd``.
-
-    *WARNING*: works with the deprecated ``mp_http://`` protocol only.
-
 --user-agent=<string>
     Use <string> as user agent for HTTP streaming.
 
-- 
cgit v1.2.3